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

# setup config and various utility to test new heads checks on push

     2

     3

. $TESTDIR/testlib/common.sh

     4

     5

cat >> $HGRCPATH <<EOF

     6

[ui]

     7

# simpler log output

     8

logtemplate ="{node|short} ({phase}): {desc}\n"

     9

    10

[phases]

    11

# non publishing server

    12

publish=False

    13

    14

[extensions]

    15

# we need to strip some changeset for some test cases

    16

strip=

    17

evolve=

    18

EOF

    19

    20

setuprepos() {

    21

    echo creating basic server and client repo

    22

    hg init server

    23

    cd server

    24

    mkcommit root

    25

    hg phase --public .

    26

    mkcommit A0

    27

    cd ..

    28

    hg clone server client

    29

}