tests/test-newbranch
author Brendan Cully <brendan@kublai.com>
Wed, 18 Oct 2006 10:37:34 -0700
changeset 3459 ba3a96750de0
parent 3451 196baf20232b
child 3502 8dc14d630b29
permissions -rwxr-xr-x
mq: test case for issue399

#!/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

echo % test for invalid branch cache
hg rollback
hg tip