tests/test-newbranch
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 21 Oct 2006 20:51:24 +0200
changeset 3474 bbfb392b2b1a
parent 3451 196baf20232b
child 3502 8dc14d630b29
permissions -rwxr-xr-x
Fix "templater object got multiple values for keyword argument 'motd'" caused by adding motd to the call to the index template (2896ce093ec4)

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