tests/test-newbranch
author Matt Mackall <mpm@selenic.com>
Wed, 01 Nov 2006 21:47:55 -0600
changeset 3618 3109f012c305
parent 3502 8dc14d630b29
child 3760 aeafd80c1e78
permissions -rwxr-xr-x
Clarify untracked file merge message

#!/bin/sh

hg init t
cd t
hg branches

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

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

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

hg branches
hg branches -q

echo % test for invalid branch cache
hg rollback
hg tip