content-divergence: store the resolved revs in evolvestate['replacements'] The support for continuing a conflicted content-divergence resolution was added some time ago. That support lacked storing of the resolved rev in the evolvestate['replacements'] which marks the node as resolved and does not try to resolve that node again. Since we didn't store, the resolution, processes the same node again. This patch makes sure we store the information in evolvestate that a certain content-divergent node is resolved to prevent pre-processing it again.

     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