Mercurial > public > mercurial-scm > hg

diff tests/test-convert-clonebranches.t @ 15615:41885892796e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: warn on branching
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 14:32:44 -0600
parents 89f1210a1238
children 687ed69f6fdf
line wrap: on
line diff
--- a/tests/test-convert-clonebranches.t	Mon Dec 05 17:09:11 2011 -0600
+++ b/tests/test-convert-clonebranches.t	Thu Dec 08 14:32:44 2011 -0600
@@ -15,6 +15,7 @@
   $ hg up -qC 0
   $ hg branch branch0
   marked working directory as branch branch0
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -qAm addb
   $ hg up -qC
@@ -52,11 +53,13 @@
   $ cd source
   $ hg branch branch1
   marked working directory as branch branch1
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a > file1
   $ hg ci -qAm c1
   $ hg up -qC mergeab
   $ hg branch branch2
   marked working directory as branch branch2
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a > file2
   $ hg ci -qAm c2
   $ hg merge branch1
@@ -64,6 +67,7 @@
   (branch merge, don't forget to commit)
   $ hg branch branch3
   marked working directory as branch branch3
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -qAm c3
   $ cd ..