evolve: support successors of ancestor of orphan with multiple roots The previous code checked that the set of successors has a single root. However, there’s no reason to require that in general. Example: o 6 | o 5 |\ | o 4 | | o | 3 |/ | * 2 | | | x 1 |/ o 0 1 is obsoleted by 3, 4 and 6. We are considering the case when 2 gets evolved. The roots are [3, 4] and the heads are [6]. Before the change, the user was asked which destination to choose, but there was only one choice (6). After the change, 6 is chosen as the destination.

     1

#!/bin/sh

     2

. $TESTDIR/testlib/pythonpath.sh

     3

     4

# This file holds logic that is used in many tests.

     5

# It can be called in a test like this:

     6

#  $ . "$TESTDIR/testlib/topic_setup.sh"

     7

     8

# Enable obsolete markers and enable extensions

     9

cat >> $HGRCPATH << EOF

    10

[experimental]

    11

evolution=createmarkers,exchange

    12

    13

[extensions]

    14

rebase=

    15

topic=

    16

EOF