evolve: add test to demonstrate issue6203 Current logic of content-divergence resolution contains a bug that if resolution parent is not the parent of any of the two divergent changesets, it could undo some changes. I think a good solution for this is to first relocate the divergent cset to it's obsolete parent's successor if applicable and then perform the content-divergence resolution. Next patch will fix the issue.

     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

}