evolve: make sure divergence resolution doesn't undo changes (issue6203) Before this patch, in content-divergence resolution logic if resolution parent is not the parent of any of the two divergent changesets then it could undo some changes introduced by previous revs (while resolving stack of content-divergent changesets) as demonstrated by the test added in previous patch. To solve this, what this patch doing is: if divergent cset has obsolete parent with a successor then first resolve the "orphan" instability of divergent cset by relocating, then perform the content-divergence resolution. After this change in logic, I found that it's kind of more correct as reflected by the changes in tests/test-evolve-content-divergent-corner-cases.t where it prevented creating conflicts while merging. Changes in tests/test-evolve-content-divergent-stack.t demonstrate the fixed behaviour. Next patches will be covering the `evolve --continue` case for the relocation of "divergent" cset.

     1

#!/bin/bash

     2

. $TESTDIR/testlib/pythonpath.sh

     3

     4

mkcommit() {

     5

   echo "$1" > "$1"

     6

   hg add "$1"

     7

   hg ci -m "$1"

     8

}

     9

    10

getid() {

    11

   hg log --hidden --template '{node}\n' --rev "$1"

    12

}

    13

    14

cat >> $HGRCPATH <<EOF

    15

[alias]

    16

debugobsolete=debugobsolete -d '0 0'

    17

EOF

    18

    19

html_output() {

    20

    filepath="$1"

    21

    touch "$filepath"

    22

    shift

    23

    24

    python $TESTDIR/testlib/arguments_printer.py 'hg' "$@" > "$filepath"

    25

    hg "$@" --color=always 2>&1 | aha -n | tee -a "$filepath"

    26

}

    27

    28

html_raw_output() {

    29

    filepath="$1"

    30

    touch "$filepath"

    31

    shift

    32

    33

    # python $TESTDIR/testlib/arguments_printer.py "$@" > "$filepath"

    34

    echo "" > "$filepath"

    35

    "$@" | tee -a "$filepath"

    36

}

    37

    38

graph() {

    39

    hg docgraph --rankdir LR --arrowhead=true --obsarrowhead=true --sphinx-directive --dot-output "$@"

    40

}