evolve: return the new replacement node to be stored in evolvestate While resolving phase-divergence, we can end up obsoleting the phase-divergent commit in favor of the public commit. Before this patch we return the node of public commit to store as a replacement of the phase-divergent commit. The above will not cause any problem till the time we use `hg evolve --abort` on an interrupted evolve which tries to strip the replacement nodes because it thinks that the replacements nodes are the ones which are created during the resolution and are new. Since we will be stripping a public node, `evolve --abort` will error out saying cannot strip public changeset, unable to abort evolve which is bad. We should make sure, replacements should only consist of new nodes formed. If the instablity is resolved by obsoleting in favour of old changeset, we should not store the old changeset in replacements in evolvestate.

     1

#require test-repo

     2

     3

  $ checkcm() {

     4

  >   if ! (which check-manifest > /dev/null); then

     5

  >     echo skipped: missing tool: check-manifest;

     6

  >     exit 80;

     7

  >   fi;

     8

  > };

     9

  $ checkcm

    10

  $ cat << EOF >> $HGRCPATH

    11

  > [experimental]

    12

  > evolution=all

    13

  > EOF

    14

    15

Run check manifest:

    16

    17

  $ cd $TESTDIR/..

    18

  $ check-manifest

    19

  lists of files in version control and sdist match