evolve: fix the broken behaviour on div resolution in relocation case In content divergence resolution, I see that when "relocationreq" is True which means both the cset are on different parent and relocation is required. In this case when "divergent" is the one who is behind the "other" cset in DAG, we swap them. At this point one thing we missed is to update the evolvestate['divergent']. Because of this in continue case we didn't get the right value of obsmarkers creation. In this patch I added the code to update the evolvestate when we swap them. Now as we know "divergent" and "other" can be swapped in some cases, it is better to store the intial divergent separately in evolvestate which is evolvestate['orig-divergent'] and later this value is used to update the evolvestate['replacements'] which is the track of revisions which has been resolved. Changes in tests demonstrate the fixed behaviour.

     1

#require test-repo

     2

     3

Enable obsolescence to avoid the warning issue when obsmarker are found

     4

     5

  $ cat << EOF >> $HGRCPATH

     6

  > [diff]

     7

  > git = yes

     8

  > [experimental]

     9

  > evolution=all

    10

  > EOF

    11

    12

Go back in the hg repo

    13

    14

  $ cd $TESTDIR/..

    15

    16

  $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do

    17

  >    hg export $node | ${RUNTESTDIR}/../contrib/check-commit > ${TESTTMP}/check-commit.out

    18

  >    if [ $? -ne 0 ]; then

    19

  >        echo "Revision $node does not comply with rules"

    20

  >        echo '------------------------------------------------------'

    21

  >        cat ${TESTTMP}/check-commit.out

    22

  >        echo

    23

  >   fi

    24

  > done