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

#!/usr/bin/env python

     2

import os

     3

import sys

     4

import subprocess

     5

     6

if len(sys.argv) < 2:

     7

    execname = os.path.basename(sys.argv[0])

     8

    print >> sys.stderr, "usage: %s CLIENT_ID" % execname

     9

    10

client_id = sys.argv[1]

    11

    12

subprocess.check_call(['hg', 'branch', "--force", "hammer-branch-%s" % client_id])

    13

    14

while True:

    15

    subprocess.check_call([

    16

        'hg', 'commit',

    17

        "--config", "ui.allowemptycommit=yes",

    18

        "--message", "hammer-%s" % client_id,

    19

    ])

    20

    nodeid = subprocess.check_output([

    21

        'hg', 'log', '--rev', '.', '--template', '{node}'

    22

    ])

    23

    subprocess.check_call([

    24

        'hg', 'debugobsolete', ''.join(reversed(nodeid)), nodeid

    25

    ])

    26

    subprocess.check_call(['hg', 'pull'])

    27

    subprocess.check_call(['hg', 'push', '--force'])