evolve: change in a test which demonstrate divergence resolution can break This patch just add "--any" flag to "hg evolve --content-divergent" in a test and changed output reflect that there is something which is not handled correctly. After looking into code I found that it is because of using a evolvestate value which is not updated i.e evolvestate['divergent'] Next patch will fix this problem.

     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