view tests/testlib/content-divergence-util.sh @ 5591:18fa4797b5dd

evolvecmd: delete bookmark-handling code obsolete since move away from rebase

We haven't relied on `rebase.rebasenode()` since 58370c718183 (evolve:
use `merge.graft` instead of `rebasenode`, 2014-12-13), so we don't
need to compensate for it.

#!/bin/sh
# setup config and various utility to test content-divergence resolution

. $TESTDIR/testlib/common.sh

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

[phases]
# non publishing server
publish=False

[extensions]
evolve=
rebase=
EOF

setuprepos() {
    echo creating test repo for test case $1
    mkdir $1
    cd $1

    echo - upstream
    hg init upstream
    cd upstream
    mkcommit O
    hg phase --public .
    cd ..
    echo - local
    hg clone -q upstream local
    echo - other
    hg clone -q upstream other
    echo 'cd into `local` and proceed with env setup'
}