Mercurial > hg > mercurial-crew-with-dirclash
changeset 4198:aee3d312c32e
Add test for branch shadowing
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 12 Mar 2007 14:50:19 -0700 |
parents | b2873c587b1a |
children | e4c586763258 |
files | tests/test-newbranch tests/test-newbranch.out |
diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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