Mercurial > hg
diff tests/test-branches @ 7006:92d44ec32430
branch: added more support for named branches
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Mon, 08 Sep 2008 12:55:27 +0200 |
| parents | 7d6622eaad08 |
| children | 405cacb06745 |
line wrap: on
line diff
--- a/tests/test-branches Mon Sep 08 11:32:53 2008 +0200 +++ b/tests/test-branches Mon Sep 08 12:55:27 2008 +0200 @@ -11,6 +11,11 @@ hg branch a hg commit -d '1 0' -u test -m "Adding a branch" +hg branch q +echo 'aa' >a +hg branch -C +hg commit -d '2 0' -u test -m "Adding to a branch" + hg update -C 0 echo 'b' >b hg add b