Mercurial > hg
diff tests/test-newbranch @ 3420:2576b6731524
Add some basic branch name tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 17 Oct 2006 18:48:41 -0500 |
parents | |
children | 196baf20232b |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-newbranch Tue Oct 17 18:48:41 2006 -0500 @@ -0,0 +1,26 @@ +#!/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 + +