view tests/test-newbranch @ 3488:40fabb2a64b8

zsh: add -r to parents
author Brendan Cully <brendan@kublai.com>
date Tue, 24 Oct 2006 11:10:04 -0700
parents 196baf20232b
children 8dc14d630b29
line wrap: on
line source

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