Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-newbranch @ 3448:6ca49c5fe268

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stop erroring out pull -r and clone -r if repository isn't local.
author Eric Hopper <hopper@omnifarious.org>
date Sat, 09 Sep 2006 18:25:07 -0700
parents 2576b6731524
children 196baf20232b
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