evolve: make sure user can recover from conflict (issue6053) we make sure while continuing interrupted evolve it reach to right code This patch fix the issue6053 which is about falling evolve into unrecoverable state and this is how it call fall into it: If after some rewrite operations we reach to a point where resparent for two content divergent csets is obsolete and we hit a conflict in relocation, so now if you run `hg evolve --continue` after resolving the conflict: code execution would check if wdir parent is obsolete and run solveobswdp() rather than going to continueevolve() part and there we will hit by a "abort: outstanding uncommitted merge" And same for `--abort` or `--stop` flags. Changes in tests reflect 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'])