evolve: test a common case of public divergence evolve: in pubdiv, handle the case when public branch is behind the mutable In public divergence, when public branch is behind the mutable one the behaviour that this patch added is that we relocate the draft one to public side. This should be fine in most case, but might be an issue in some other (eg, when the draft side of the divergence is rebase away from ancestors it relies on.) Test written by Pierre-Yves David <pierre-yves.david@octobus.net>

     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