evolve: prompt user for branch selection while resolving content-divergence When resolving content-divergence, there can be case when both the content-divergent changesets are on different named branches. In that case, we are not sure which branch should the resolution commit should be on. This patch adds logic to prompt user to choose the branch which the resolution commit should be on and then creates the new resolution commit on that branch. This also adds a new test file which have tests for the branch selection feature we have added.

     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

}