tests/test-newbranch
author Eric Hopper <hopper@omnifarious.org>
Sat, 09 Sep 2006 18:25:07 -0700
changeset 3448 6ca49c5fe268
parent 3435 2576b6731524
child 3451 196baf20232b
permissions -rwxr-xr-x
Stop erroring out pull -r and clone -r if repository isn't local.

#!/bin/sh

hg init t
cd t

echo foo > a
hg add a
hg ci -m "initial" -d "0 0"
echo foo > .hg/branch
hg ci -m "add branch name" -d "0 0"
echo bar > .hg/branch
hg ci -m "change branch name" -d "0 0"
rm .hg/branch
hg ci -m "clear branch name" -d "0 0"

hg co foo
cat .hg/branch
echo bleah > a
hg ci -m "modify a branch" -d "0 0"

hg merge
cat .hg/branch
HG_MERGE=true hg ci -m "merge" -d "0 0"
hg log