view tests/testlib/push-checkheads-util.sh @ 3322:20b6dae466a7

stablesort: use 'depth' in mergepoint tie breaker

The parents with the most depth will is considered lower. It has a couple of
advantages.

1) the more shallow parent probably have less exclusive revision,

2) it makes Oedipus merge behave like close to the linear case,

# setup config and various utility to test new heads checks on push

. $TESTDIR/testlib/common.sh

cat >> $HGRCPATH <<EOF
[ui]
# simpler log output
logtemplate ="{node|short} ({phase}): {desc}\n"

[phases]
# non publishing server
publish=False

[extensions]
# we need to strip some changeset for some test cases
strip=
evolve=
EOF

setuprepos() {
    echo creating basic server and client repo
    hg init server
    cd server
    mkcommit root
    hg phase --public .
    mkcommit A0
    cd ..
    hg clone server client
}