Mercurial > public > mercurial-scm > hg
diff tests/test-tag.t @ 15615:41885892796e stable
branch: warn on branching
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Dec 2011 14:32:44 -0600 |
parents | 301725c3df9a |
children | fc8c7a5ccc4a |
line wrap: on
line diff
--- a/tests/test-tag.t Mon Dec 05 17:09:11 2011 -0600 +++ b/tests/test-tag.t Thu Dec 08 14:32:44 2011 -0600 @@ -205,6 +205,7 @@ $ hg branch tag-and-branch-same-name marked working directory as branch tag-and-branch-same-name + (branches are permanent and global, did you want a bookmark?) $ hg ci -m"discouraged" $ hg tag tag-and-branch-same-name warning: tag tag-and-branch-same-name conflicts with existing branch name @@ -276,6 +277,7 @@ $ hg co -q 0 $ hg branch b1 marked working directory as branch b1 + (branches are permanent and global, did you want a bookmark?) $ hg ci -m2 $ hg up default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved