evolve: change in a test which demonstrate divergence resolution can break This patch just add "--any" flag to "hg evolve --content-divergent" in a test and changed output reflect that there is something which is not handled correctly. After looking into code I found that it is because of using a evolvestate value which is not updated i.e evolvestate['divergent'] Next patch will fix this problem.

. $TESTDIR/testlib/common.sh

cat >> $HGRCPATH <<EOF
[ui]
interactive = true
[phases]
publish=False
[extensions]
evolve =
[experimental]
evolution.effect-flags = yes
EOF

sync() {
   hg pull -R $TESTTMP/server . -q
}