Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test for branch shadowing
authorBrendan Cully <brendan@kublai.com>
Mon, 12 Mar 2007 14:50:19 -0700
changeset 4203 aee3d312c32e
parent 4202 b2873c587b1a
child 4204 e4c586763258
Add test for branch shadowing
tests/test-newbranch file | annotate | diff | comparison | revisions
tests/test-newbranch.out file | annotate | diff | comparison | revisions 
--- 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
--- 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
mercurial