Mercurial > hg
diff tests/test-bheads.t @ 15615:41885892796e stable
branch: warn on branching
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Dec 2011 14:32:44 -0600 |
parents | 22f3353bcc36 |
children | f2719b387380 |
line wrap: on
line diff
--- a/tests/test-bheads.t Mon Dec 05 17:09:11 2011 -0600 +++ b/tests/test-bheads.t Thu Dec 08 14:32:44 2011 -0600 @@ -20,6 +20,7 @@ $ hg add a $ hg branch a marked working directory as branch a + (branches are permanent and global, did you want a bookmark?) $ hg commit -m "Adding a branch" $ heads 1: Adding a branch (a) @@ -36,6 +37,7 @@ $ hg add b $ hg branch b marked working directory as branch b + (branches are permanent and global, did you want a bookmark?) $ hg commit -m "Adding b branch" $ heads 2: Adding b branch (b) @@ -117,6 +119,7 @@ $ hg add c $ hg branch c marked working directory as branch c + (branches are permanent and global, did you want a bookmark?) $ hg commit -m "Adding c branch" $ heads 7: Adding c branch (c) @@ -287,6 +290,7 @@ $ hg branch b marked working directory as branch b + (branches are permanent and global, did you want a bookmark?) $ echo 1 > b $ hg ci -Am "b2: Initial root for branch b" adding b @@ -298,6 +302,7 @@ $ hg up -q null $ hg branch -f b marked working directory as branch b + (branches are permanent and global, did you want a bookmark?) $ echo 1 > bb $ hg ci -Am "b4 (NN): new topo root for branch b" adding bb @@ -312,6 +317,7 @@ $ hg branch -f default marked working directory as branch default + (branches are permanent and global, did you want a bookmark?) $ echo 1 > aa $ hg ci -Am "a6 (BN): new branch root" adding aa @@ -331,6 +337,7 @@ $ hg merge -q 3 $ hg branch -f default marked working directory as branch default + (branches are permanent and global, did you want a bookmark?) $ hg ci -m "a8 (BB): weird new branch root" created new head