# HG changeset patch # User Brendan Cully # Date 1173736219 25200 # Node ID aee3d312c32e77630ecbb1e09726621598efd9f5 # Parent b2873c587b1a87b207ba5b1e2758dfdfe46be906 Add test for branch shadowing diff -r b2873c587b1a -r aee3d312c32e tests/test-newbranch --- a/tests/test-newbranch Mon Mar 12 14:44:14 2007 -0700 +++ b/tests/test-newbranch Mon Mar 12 14:50:19 2007 -0700 @@ -12,7 +12,9 @@ hg ci -m "add branch name" -d "1000000 0" hg branch bar hg ci -m "change branch name" -d "1000000 0" +echo % branch shadowing hg branch "" +hg branch -f '' hg ci -m "clear branch name" -d "1000000 0" hg co foo diff -r b2873c587b1a -r aee3d312c32e tests/test-newbranch.out --- a/tests/test-newbranch.out Mon Mar 12 14:44:14 2007 -0700 +++ b/tests/test-newbranch.out Mon Mar 12 14:50:19 2007 -0700 @@ -1,4 +1,6 @@ foo +% branch shadowing +abort: a branch of the same name already exists (use --force to override) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved