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.

     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

}