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

# 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

}