tests: demonstrate obsmarker creation after discarding conflicting changes Continued evolve creates an incorrect obsmarker that says 2 is a successor of 1. It's incorrect because 1 was dropped as it created no changes to commit (after conflict resolution that discarded its changes). If evolve does the same thing in one go (e.g. just by using --tool :local and without subsequent need to continue) the obsmarker is correct.

     1

. $TESTDIR/testlib/pythonpath.sh

     2

     3

mkcommit() {

     4

   echo "$1" > "$1"

     5

   hg add "$1"

     6

   hg ci -m "$1"

     7

}

     8

     9

getid() {

    10

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

    11

}

    12

    13

cat >> $HGRCPATH <<EOF

    14

[alias]

    15

debugobsolete=debugobsolete -d '0 0'

    16

EOF