# HG changeset patch # User Brendan Cully # Date 2007-03-12 21:50:19 # Node ID aee3d312c32e77630ecbb1e09726621598efd9f5 # Parent b2873c587b1a87b207ba5b1e2758dfdfe46be906 Add test for branch shadowing diff --git a/tests/test-newbranch b/tests/test-newbranch --- a/tests/test-newbranch +++ b/tests/test-newbranch @@ -12,7 +12,9 @@ hg branch 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 --git a/tests/test-newbranch.out b/tests/test-newbranch.out --- a/tests/test-newbranch.out +++ b/tests/test-newbranch.out @@ -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