diff tests/test-commit-multiple.t @ 15615:41885892796e stable

branch: warn on branching
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 14:32:44 -0600
parents 8bb03283e9b9
children f2719b387380
line wrap: on
line diff
--- a/tests/test-commit-multiple.t	Mon Dec 05 17:09:11 2011 -0600
+++ b/tests/test-commit-multiple.t	Thu Dec 08 14:32:44 2011 -0600
@@ -31,6 +31,7 @@
 commit bug fixes on bug fix branch
   $ hg branch fixes
   marked working directory as branch fixes
+  (branches are permanent and global, did you want a bookmark?)
   $ echo fix1 > bugfix
   $ echo fix1 >> file1
   $ hg ci -Am"fix 1"
@@ -52,6 +53,7 @@
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg branch release
   marked working directory as branch release
+  (branches are permanent and global, did you want a bookmark?)
   $ hg transplant 2 3
   applying [0-9a-f]{12} (re)
   [0-9a-f]{12} transplanted to [0-9a-f]{12} (re)