evolve: consider all obsolete ancestors when finding new parent for orphan Both the old and the new logic have in common that the orphan changeset is moved to the tipmost successor of one or more ancestors of the orphan changeset. The previous logic considered only the first non-pruned ancestor of the orphan changeset. The new logic considers all obsolete ancestors of the orphan changeset. The logic in _possibledestination() had to be changed to be consistent with the new logic.

     1

. $TESTDIR/testlib/common.sh

     2

     3

cat >> $HGRCPATH <<EOF

     4

[ui]

     5

interactive = true

     6

[phases]

     7

publish=False

     8

[extensions]

     9

evolve =

    10

[experimental]

    11

evolution.effect-flags = yes

    12

EOF

    13

    14

sync() {

    15

   hg pull -R $TESTTMP/server . -q

    16

}