Mercurial > hg

changeset 15623:fc8c7a5ccc4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 16:01:44 -0600
parents 86fc364ca5f8 (current diff) 05e522d3f186 (diff)
children be43234a6d60
files mercurial/commands.py tests/test-acl.t tests/test-backout.t tests/test-clone.t tests/test-fetch.t tests/test-hgweb-commands.t tests/test-http-branchmap.t tests/test-import-bypass.t tests/test-keyword.t tests/test-log.t tests/test-merge-default.t tests/test-mq-safety.t tests/test-patchbomb.t tests/test-rebase-check-restore.t tests/test-record.t tests/test-revset-outgoing.t tests/test-revset.t tests/test-rollback.t tests/test-subrepo.t tests/test-tag.t tests/test-url-rev.t
diffstat 45 files changed, 136 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/doc/hg.1.txt	Thu Dec 08 16:39:00 2011 +0100
+++ b/doc/hg.1.txt	Thu Dec 08 16:01:44 2011 -0600
@@ -50,16 +50,6 @@
 Files
 -----
 
-``.hgignore``
-    This file contains regular expressions (one per line) that
-    describe file names that should be ignored by **hg**. For details,
-    see |hgignore(5)|_.
-
-``.hgtags``
-    This file contains changeset hash values and text tag names (one
-    of each separated by spaces) that correspond to tagged versions of
-    the repository contents.
-
 ``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
     This file contains defaults and configuration. Values in
     ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
@@ -67,6 +57,34 @@
     See |hgrc(5)|_ for details of the contents and format of these
     files.
 
+``.hgignore``
+    This file contains regular expressions (one per line) that
+    describe file names that should be ignored by **hg**. For details,
+    see |hgignore(5)|_.
+
+``.hgsub``
+    This file defines the locations of all subrepositories, and
+    tells where the subrepository checkouts came from. For details, see
+    :hg:`help subrepos`.
+
+``.hgsubstate``
+    This file is where Mercurial stores all nested repository states. *NB: This
+    file should not be edited manually.*
+
+``.hgtags``
+    This file contains changeset hash values and text tag names (one
+    of each separated by spaces) that correspond to tagged versions of
+    the repository contents. The file content is encoded using UTF-8.
+
+``.hg/last-message.txt``
+    This file is used by :hg:`commit` to store a backup of the commit message
+    in case the commit fails.
+
+``.hg/localtags``
+    This file can be used to define local tags which are not shared among
+    repositories. The file format is the same as for ``.hgtags``, but it is
+    encoded using the local system encoding.
+    
 Some commands (e.g. revert) produce backup files ending in ``.orig``,
 if the ``.orig`` file already exists and is not tracked by Mercurial,
 it will be overwritten.
--- a/mercurial/commands.py	Thu Dec 08 16:39:00 2011 +0100
+++ b/mercurial/commands.py	Thu Dec 08 16:01:44 2011 -0600
@@ -862,6 +862,8 @@
                                  hint=_("use 'hg update' to switch to it"))
         repo.dirstate.setbranch(label)
         ui.status(_('marked working directory as branch %s\n') % label)
+        ui.status(_('(branches are permanent and global, '
+                    'did you want a bookmark?)\n'))
     else:
         ui.write("%s\n" % repo.dirstate.branch())
 
--- a/tests/test-acl.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-acl.t	Thu Dec 08 16:01:44 2011 -0600
@@ -1360,6 +1360,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foobar
   marked working directory as branch foobar
+  (branches are permanent and global, did you want a bookmark?)
   $ hg commit -m 'create foobar'
   $ echo 'foo contents' > abc.txt
   $ hg add abc.txt
--- a/tests/test-backout.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-backout.t	Thu Dec 08 16:01:44 2011 -0600
@@ -225,11 +225,13 @@
   adding default
   $ hg branch branch1
   marked working directory as branch branch1
+  (branches are permanent and global, did you want a bookmark?)
   $ echo branch1 > file1
   $ hg ci -d '1 0' -Am file1
   adding file1
   $ hg branch branch2
   marked working directory as branch branch2
+  (branches are permanent and global, did you want a bookmark?)
   $ echo branch2 > file2
   $ hg ci -d '2 0' -Am file2
   adding file2
--- a/tests/test-bheads.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-bheads.t	Thu Dec 08 16:01: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
 
--- a/tests/test-bookmarks.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-bookmarks.t	Thu Dec 08 16:01:44 2011 -0600
@@ -324,6 +324,7 @@
   $ echo y > tobundle/y
   $ hg -R tobundle branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
   $ hg -R tobundle add tobundle/y
   $ hg -R tobundle commit -m'y'
   $ hg -R tobundle bundle tobundle.hg
--- a/tests/test-branch-option.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-branch-option.t	Thu Dec 08 16:01:44 2011 -0600
@@ -4,6 +4,7 @@
   $ cd branch
   $ hg branch a
   marked working directory as branch a
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a > foo
   $ hg ci -d '0 0' -Ama
   adding foo
@@ -13,6 +14,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch c
   marked working directory as branch c
+  (branches are permanent and global, did you want a bookmark?)
   $ echo c > foo
   $ hg ci -d '0 0' -mc
   $ hg tag -l z
@@ -29,18 +31,21 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > foo
   $ hg ci -d '0 0' -mb
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --encoding utf-8 branch æ
   marked working directory as branch \xc3\xa6 (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ echo ae1 > foo
   $ hg ci -d '0 0' -mae1
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --encoding utf-8 branch -f æ
   marked working directory as branch \xc3\xa6 (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ echo ae2 > foo
   $ hg ci -d '0 0' -mae2
   created new head
@@ -48,6 +53,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch -f b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b2 > foo
   $ hg ci -d '0 0' -mb2
   created new head
--- a/tests/test-branch-tag-confict.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-branch-tag-confict.t	Thu Dec 08 16:01:44 2011 -0600
@@ -14,6 +14,7 @@
 
   $ hg branch branchortag
   marked working directory as branch branchortag
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'Create a branch with the same name as a tag.'
 
 This is what we have:
--- a/tests/test-branches.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-branches.t	Thu Dec 08 16:01:44 2011 -0600
@@ -8,10 +8,12 @@
   $ hg add a
   $ hg branch a
   marked working directory as branch a
+  (branches are permanent and global, did you want a bookmark?)
   $ hg commit -d '1 0' -m "Adding a branch"
 
   $ hg branch q
   marked working directory as branch q
+  (branches are permanent and global, did you want a bookmark?)
   $ echo 'aa' >a
   $ hg branch -C
   reset working directory to branch a
@@ -23,6 +25,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 -d '2 0' -m "Adding b branch"
 
   $ echo 'bh1' >bh1
@@ -39,6 +42,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 -d '5 0' -m "Adding c branch"
 
   $ hg branch tip
@@ -55,6 +59,7 @@
   $ hg add d
   $ hg branch 'a branch name much longer than the default justification used by branches'
   marked working directory as branch a branch name much longer than the default justification used by branches
+  (branches are permanent and global, did you want a bookmark?)
   $ hg commit -d '6 0' -m "Adding d branch"
 
   $ hg branches
--- a/tests/test-clone-update-order.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-clone-update-order.t	Thu Dec 08 16:01:44 2011 -0600
@@ -6,6 +6,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch mine
   marked working directory as branch mine
+  (branches are permanent and global, did you want a bookmark?)
   $ echo hello > world
   $ hg commit -Am hello
   adding world
@@ -13,6 +14,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch other
   marked working directory as branch other
+  (branches are permanent and global, did you want a bookmark?)
   $ echo good > bye
   $ hg commit -Am other
   adding bye
--- a/tests/test-clone.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-clone.t	Thu Dec 08 16:01:44 2011 -0600
@@ -132,6 +132,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch stable
   marked working directory as branch stable
+  (branches are permanent and global, did you want a bookmark?)
   $ echo some text >a
   $ hg ci -m "starting branch stable"
   $ hg tag ref2
--- a/tests/test-commit-multiple.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-commit-multiple.t	Thu Dec 08 16:01: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)
--- a/tests/test-convert-clonebranches.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-convert-clonebranches.t	Thu Dec 08 16:01: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 ..
 
--- a/tests/test-convert-datesort.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-convert-datesort.t	Thu Dec 08 16:01:44 2011 -0600
@@ -11,6 +11,7 @@
   adding a
   $ hg branch brancha
   marked working directory as branch brancha
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -m a1 -d '2 0'
   $ echo a >> a
@@ -21,6 +22,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch branchb
   marked working directory as branch branchb
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b >> b
   $ hg ci -Am b0 -d '6 0'
   adding b
--- a/tests/test-convert-filemap.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-convert-filemap.t	Thu Dec 08 16:01:44 2011 -0600
@@ -299,6 +299,7 @@
   $ cd branchpruning
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a > a
   $ hg ci -Am adda
   adding a
@@ -307,12 +308,14 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch empty
   marked working directory as branch empty
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m emptybranch
   $ hg ci --close-branch -m closeempty
   $ hg up 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch default
   marked working directory as branch default
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -Am addb
   adding b
--- a/tests/test-encoding-align.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-encoding-align.t	Thu Dec 08 16:01:44 2011 -0600
@@ -115,12 +115,15 @@
 
   $ hg branch $S
   marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ hg tag $S
   $ hg branch $M
   marked working directory as branch MIDDLE_
+  (branches are permanent and global, did you want a bookmark?)
   $ hg tag $M
   $ hg branch $L
   marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ hg tag $L
 
 check alignment of branches
--- a/tests/test-encoding.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-encoding.t	Thu Dec 08 16:01:44 2011 -0600
@@ -42,6 +42,7 @@
   $ HGENCODING=latin-1 hg tag `cat latin-1-tag`
   $ HGENCODING=latin-1 hg branch `cat latin-1-tag`
   marked working directory as branch \xe9 (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ HGENCODING=latin-1 hg ci -m 'latin1 branch'
   $ rm .hg/branch
 
--- a/tests/test-fetch.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-fetch.t	Thu Dec 08 16:01:44 2011 -0600
@@ -144,12 +144,14 @@
   adding a
   $ hg -R nbase branch a
   marked working directory as branch a
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a > nbase/a
   $ hg -R nbase ci -m a
   $ hg -R nbase up -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R nbase branch b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > nbase/b
   $ hg -R nbase ci -Am b
   adding b
@@ -318,6 +320,7 @@
   $ hg -R n1 ci -m next
   $ hg -R n2 branch topic
   marked working directory as branch topic
+  (branches are permanent and global, did you want a bookmark?)
   $ hg -R n2 fetch -m merge n1
   abort: working dir not at branch tip (use "hg update" to check out branch tip)
   [255]
@@ -336,11 +339,13 @@
   adding a
   $ hg --cwd ib1 branch second
   marked working directory as branch second
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > ib1/b
   $ hg --cwd ib1 ci -Am onsecond
   adding b
   $ hg --cwd ib1 branch -f default
   marked working directory as branch default
+  (branches are permanent and global, did you want a bookmark?)
   $ echo c > ib1/c
   $ hg --cwd ib1 ci -Am newdefault
   adding c
--- a/tests/test-hgweb-commands.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-hgweb-commands.t	Thu Dec 08 16:01:44 2011 -0600
@@ -22,6 +22,7 @@
   $ echo another > foo
   $ hg branch stable
   marked working directory as branch stable
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Ambranch
   $ hg serve --config server.uncompressed=False -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
--- a/tests/test-http-branchmap.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-http-branchmap.t	Thu Dec 08 16:01:44 2011 -0600
@@ -7,6 +7,7 @@
   $ hg init a
   $ hg --encoding utf-8 -R a branch æ
   marked working directory as branch \xc3\xa6 (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ echo foo > a/foo
   $ hg -R a ci -Am foo
   adding foo
--- a/tests/test-impexp-branch.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-impexp-branch.t	Thu Dec 08 16:01:44 2011 -0600
@@ -19,6 +19,7 @@
   $ hg commit -m "No branch."
   $ hg branch abranch
   marked working directory as branch abranch
+  (branches are permanent and global, did you want a bookmark?)
   $ echo "Rev  2" >rev
   $ hg commit -m "With branch."
 
--- a/tests/test-import-bypass.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-import-bypass.t	Thu Dec 08 16:01:44 2011 -0600
@@ -18,6 +18,7 @@
   $ echo a >> a
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Am changea
   $ hg export . > ../test.diff
   $ hg up null
--- a/tests/test-issue1306.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-issue1306.t	Thu Dec 08 16:01:44 2011 -0600
@@ -11,6 +11,7 @@
 
   $ hg branch br
   marked working directory as branch br
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Amb
 
   $ echo c > c
--- a/tests/test-issue619.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-issue619.t	Thu Dec 08 16:01:44 2011 -0600
@@ -8,6 +8,7 @@
   $ echo b > b
   $ hg branch b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Amb
   adding b
 
--- a/tests/test-issue842.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-issue842.t	Thu Dec 08 16:01:44 2011 -0600
@@ -31,6 +31,7 @@
   $ echo crap > a
   $ hg branch testing
   marked working directory as branch testing
+  (branches are permanent and global, did you want a bookmark?)
 
 Should not issue warning:
 
--- a/tests/test-keyword.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-keyword.t	Thu Dec 08 16:01:44 2011 -0600
@@ -1005,6 +1005,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ mv a a.bak
   $ echo foobranch > a
   $ cat a.bak >> a
--- a/tests/test-log.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-log.t	Thu Dec 08 16:01:44 2011 -0600
@@ -629,6 +629,7 @@
   adding a
   $ hg branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -A -m "commit on test"
   adding b
--- a/tests/test-merge-closedheads.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-merge-closedheads.t	Thu Dec 08 16:01:44 2011 -0600
@@ -68,6 +68,7 @@
 hg branch some-branch
   $ hg branch some-branch
   marked working directory as branch some-branch
+  (branches are permanent and global, did you want a bookmark?)
 hg commit
   $ hgcommit -m 'started some-branch'
 hg commit --close-branch
--- a/tests/test-merge-default.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-merge-default.t	Thu Dec 08 16:01:44 2011 -0600
@@ -85,6 +85,7 @@
   $ echo f >> a
   $ hg branch foobranch
   marked working directory as branch foobranch
+  (branches are permanent and global, did you want a bookmark?)
   $ hg commit -mf
 
 Should fail because merge with other branch:
--- a/tests/test-mq-safety.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-mq-safety.t	Thu Dec 08 16:01:44 2011 -0600
@@ -76,6 +76,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ echo c > c
   $ hg ci -Amc
   adding c
@@ -125,6 +126,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch branch
   marked working directory as branch branch
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -Am addb
   adding b
--- a/tests/test-newbranch.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-newbranch.t	Thu Dec 08 16:01:44 2011 -0600
@@ -9,11 +9,13 @@
   $ hg ci -m "initial"
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ hg branch
   foo
   $ hg ci -m "add branch name"
   $ hg branch bar
   marked working directory as branch bar
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m "change branch name"
 
 Branch shadowing:
@@ -25,6 +27,7 @@
 
   $ hg branch -f default
   marked working directory as branch default
+  (branches are permanent and global, did you want a bookmark?)
 
   $ hg ci -m "clear branch name"
   created new head
@@ -186,6 +189,7 @@
 
   $ hg branch foobar
   marked working directory as branch foobar
+  (branches are permanent and global, did you want a bookmark?)
 
   $ hg up
   abort: branch foobar not found
@@ -195,6 +199,7 @@
 
   $ hg branch ff
   marked working directory as branch ff
+  (branches are permanent and global, did you want a bookmark?)
 
   $ echo ff > ff
   $ hg ci -Am'fast forward'
@@ -256,6 +261,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
   $ echo e >> e
   $ hg ci -Ame
   adding e
--- a/tests/test-patchbomb.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-patchbomb.t	Thu Dec 08 16:01:44 2011 -0600
@@ -2020,6 +2020,7 @@
 
   $ hg branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
 
   $ echo d > d
   $ hg add d
--- a/tests/test-pull-branch.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-pull-branch.t	Thu Dec 08 16:01:44 2011 -0600
@@ -5,6 +5,7 @@
   adding foo
   $ hg branch branchA
   marked working directory as branch branchA
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a1 > foo
   $ hg ci -ma1 # 1
 
@@ -32,6 +33,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch branchB
   marked working directory as branch branchB
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b1 > foo
   $ hg ci -mb1 # 3
 
@@ -139,6 +141,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch branchC
   marked working directory as branch branchC
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b1 > bar 
   $ hg ci -Am "commit on branchC on tt"
   adding bar
--- a/tests/test-push-warn.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-push-warn.t	Thu Dec 08 16:01:44 2011 -0600
@@ -393,6 +393,7 @@
   $ hg init j
   $ hg -R j branch a
   marked working directory as branch a
+  (branches are permanent and global, did you want a bookmark?)
   $ echo init > j/foo
   $ hg -R j ci -Am init
   adding foo
@@ -403,6 +404,7 @@
   $ hg -R j ci -m a1
   $ hg -R k branch b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > k/foo
   $ hg -R k ci -m b
   $ hg -R k up 0
@@ -466,11 +468,13 @@
   $ cd n
   $ hg branch A
   marked working directory as branch A
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a >a
   $ hg ci -Ama
   adding a
   $ hg branch B
   marked working directory as branch B
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b >b
   $ hg ci -Amb
   adding b
@@ -543,11 +547,13 @@
   $ cd o
   $ hg branch A
   marked working directory as branch A
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a >a
   $ hg ci -Ama
   adding a
   $ hg branch B
   marked working directory as branch B
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b >b
   $ hg ci -Amb
   adding b
@@ -629,6 +635,7 @@
   $ cd p
   $ hg branch A
   marked working directory as branch A
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a0 >a
   $ hg ci -Ama0
   adding a
@@ -638,6 +645,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch B
   marked working directory as branch B
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b0 >b
   $ hg ci -Amb0
   adding b
@@ -652,6 +660,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch -f B
   marked working directory as branch B
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a3 >a
   $ hg ci -ma3
   created new head
@@ -659,6 +668,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch -f A
   marked working directory as branch A
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b3 >b
   $ hg ci -mb3
   created new head
--- a/tests/test-rebase-cache.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-rebase-cache.t	Thu Dec 08 16:01:44 2011 -0600
@@ -17,6 +17,7 @@
 
   $ hg branch branch1
   marked working directory as branch branch1
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch1'
 
   $ echo b > b
@@ -27,6 +28,7 @@
 
   $ hg branch branch2
   marked working directory as branch branch2
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch2'
 
   $ echo c > C
@@ -37,6 +39,7 @@
 
   $ hg branch -f branch2
   marked working directory as branch branch2
+  (branches are permanent and global, did you want a bookmark?)
   $ echo d > d
   $ hg ci -Am D
   adding d
@@ -51,6 +54,7 @@
 
   $ hg branch branch3
   marked working directory as branch branch3
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch3'
 
   $ echo f > f
--- a/tests/test-rebase-check-restore.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-rebase-check-restore.t	Thu Dec 08 16:01:44 2011 -0600
@@ -36,6 +36,7 @@
 
   $ hg branch 'notdefault'
   marked working directory as branch notdefault
+  (branches are permanent and global, did you want a bookmark?)
   $ echo F >> A
   $ hg ci -m F
 
--- a/tests/test-rebase-collapse.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-rebase-collapse.t	Thu Dec 08 16:01:44 2011 -0600
@@ -452,12 +452,14 @@
 
   $ hg branch '1'
   marked working directory as branch 1
+  (branches are permanent and global, did you want a bookmark?)
   $ echo 'b' > b
   $ hg ci -Am 'B'
   adding b
 
   $ hg branch '2'
   marked working directory as branch 2
+  (branches are permanent and global, did you want a bookmark?)
   $ echo 'c' > c
   $ hg ci -Am 'C'
   adding c
--- a/tests/test-rebase-named-branches.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-rebase-named-branches.t	Thu Dec 08 16:01:44 2011 -0600
@@ -28,6 +28,7 @@
 
   $ hg branch dev
   marked working directory as branch dev
+  (branches are permanent and global, did you want a bookmark?)
 
   $ echo x > x
 
--- a/tests/test-record.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-record.t	Thu Dec 08 16:01:44 2011 -0600
@@ -896,6 +896,7 @@
 
   $ hg branch thatbranch
   marked working directory as branch thatbranch
+  (branches are permanent and global, did you want a bookmark?)
 
   $ hg ci -m'new head'
 
--- a/tests/test-revset-outgoing.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-revset-outgoing.t	Thu Dec 08 16:01:44 2011 -0600
@@ -21,6 +21,7 @@
 
   $ hg branch stable
   marked working directory as branch stable
+  (branches are permanent and global, did you want a bookmark?)
   $ echo bar >> a
   $ hg ci -qm2
 
--- a/tests/test-revset.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-revset.t	Thu Dec 08 16:01:44 2011 -0600
@@ -17,22 +17,26 @@
   $ echo a > a
   $ hg branch a
   marked working directory as branch a
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm0
 
   $ echo b > b
   $ hg branch b
   marked working directory as branch b
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm1
 
   $ rm a
   $ hg branch a-b-c-
   marked working directory as branch a-b-c-
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm2 -u Bob
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch +a+b+c+
   marked working directory as branch +a+b+c+
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm3
 
   $ hg co 2  # interleave
@@ -40,12 +44,14 @@
   $ echo bb > b
   $ hg branch -- -a-b-c-
   marked working directory as branch -a-b-c-
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm4 -d "May 12 2005"
 
   $ hg co 3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch /a/b/c/
   marked working directory as branch /a/b/c/
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm"5 bug"
 
   $ hg merge 4
@@ -53,14 +59,17 @@
   (branch merge, don't forget to commit)
   $ hg branch _a_b_c_
   marked working directory as branch _a_b_c_
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm"6 issue619"
 
   $ hg branch .a.b.c.
   marked working directory as branch .a.b.c.
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm7
 
   $ hg branch all
   marked working directory as branch all
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci --close-branch -Aqm8
   abort: can only close branch heads
   [255]
@@ -69,6 +78,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch é
   marked working directory as branch \xc3\xa9 (esc)
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm9
 
   $ hg tag -r6 1.0
--- a/tests/test-rollback.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-rollback.t	Thu Dec 08 16:01:44 2011 -0600
@@ -43,6 +43,7 @@
 Test issue 902 (current branch is preserved)
   $ hg branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   working directory now based on revision 0
@@ -58,6 +59,7 @@
   $ hg commit -m "test3"
   $ hg branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
   $ rm .hg/undo.branch
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
--- a/tests/test-subrepo.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-subrepo.t	Thu Dec 08 16:01:44 2011 -0600
@@ -407,6 +407,7 @@
   adding a
   $ hg branch br
   marked working directory as branch br
+  (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -m1
   $ hg up default
@@ -457,6 +458,7 @@
   committing subrepository s
   $ hg branch br
   marked working directory as branch br
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg -R s up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-tag.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-tag.t	Thu Dec 08 16:01:44 2011 -0600
@@ -207,6 +207,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
@@ -278,6 +279,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
--- a/tests/test-url-rev.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-url-rev.t	Thu Dec 08 16:01:44 2011 -0600
@@ -6,6 +6,7 @@
   $ hg ci -qAm 'add a'
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ echo >> a
   $ hg ci -m 'change a'
   $ cd ..