view tests/testlib/obshistory_setup.sh @ 4384:8993fd4805d0

evolve: update the public divergence resolution logic to cover --continue case

To continue the interrupted evolve in case of public divergence:
we will have to store the node of that public cset which was in
content divergence with the other cset, so that we can perform the
phase divergence resolution between that public cset and a newnode
which is the result of content-divergence resolution.

Added tests reflect the behaviour this patch adds.

. $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
}