diff --git a/mercurial/commands.py b/mercurial/commands.py
index ab618e52788a6dc09202d812b454327404aa13ef_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1107,8 +1107,13 @@
             scmutil.checknewlabel(repo, label, 'branch')
             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'))
+
+            # find any open named branches aside from default
+            others = [n for n, h, t, c in repo.branchmap().iterbranches()
+                      if n != "default" and not c]
+            if not others:
+                ui.status(_('(branches are permanent and global, '
+                            'did you want a bookmark?)\n'))
     finally:
         wlock.release()
 
diff --git a/tests/test-backout.t b/tests/test-backout.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1iYWNrb3V0LnQ=..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1iYWNrb3V0LnQ= 100644
--- a/tests/test-backout.t
+++ b/tests/test-backout.t
@@ -389,7 +389,6 @@
   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
diff --git a/tests/test-bheads.t b/tests/test-bheads.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1iaGVhZHMudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1iaGVhZHMudA== 100644
--- a/tests/test-bheads.t
+++ b/tests/test-bheads.t
@@ -37,7 +37,6 @@
   $ 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)
@@ -119,7 +118,6 @@
   $ 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)
@@ -302,7 +300,6 @@
   $ 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
@@ -317,7 +314,6 @@
 
   $ 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
@@ -337,7 +333,6 @@
   $ 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
 
diff --git a/tests/test-branch-option.t b/tests/test-branch-option.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1icmFuY2gtb3B0aW9uLnQ=..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1icmFuY2gtb3B0aW9uLnQ= 100644
--- a/tests/test-branch-option.t
+++ b/tests/test-branch-option.t
@@ -14,7 +14,6 @@
   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
@@ -31,10 +30,9 @@
   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)
@@ -35,13 +33,12 @@
   $ 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)
@@ -42,10 +39,9 @@
   $ 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
@@ -53,7 +49,6 @@
   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
diff --git a/tests/test-branches.t b/tests/test-branches.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1icmFuY2hlcy50..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1icmFuY2hlcy50 100644
--- a/tests/test-branches.t
+++ b/tests/test-branches.t
@@ -13,7 +13,6 @@
 
   $ 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
@@ -25,7 +24,6 @@
   $ 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
@@ -42,7 +40,6 @@
   $ 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"
 
 reserved names
@@ -101,7 +98,6 @@
   $ 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
@@ -601,7 +597,6 @@
 cache is updated when committing
   $ hg branch i-will-regret-this
   marked working directory as branch i-will-regret-this
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m regrets
   $ f --size .hg/cache/rbc-*
   .hg/cache/rbc-names-v1: size=106
diff --git a/tests/test-clone-update-order.t b/tests/test-clone-update-order.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1jbG9uZS11cGRhdGUtb3JkZXIudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1jbG9uZS11cGRhdGUtb3JkZXIudA== 100644
--- a/tests/test-clone-update-order.t
+++ b/tests/test-clone-update-order.t
@@ -14,7 +14,6 @@
   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
diff --git a/tests/test-clone.t b/tests/test-clone.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1jbG9uZS50..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1jbG9uZS50 100644
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -357,7 +357,6 @@
 
   $ hg -R ua branch @
   marked working directory as branch @
-  (branches are permanent and global, did you want a bookmark?)
   $ hg -R ua commit -m 'created branch @'
   $ hg clone ua atbranch
   updating to branch default
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1jb21taXQtYW1lbmQudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1jb21taXQtYW1lbmQudA== 100644
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -373,7 +373,6 @@
   $ hg ci -m 'branch foo'
   $ hg branch default -f
   marked working directory as branch default
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci --amend -m 'back to default'
   saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-fd962fef-amend-backup.hg (glob)
   $ hg branches
@@ -848,7 +847,6 @@
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
-  (branches are permanent and global, did you want a bookmark?)
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m..
@@ -860,7 +858,6 @@
 
   $ hg branch silliness
   marked working directory as branch silliness
-  (branches are permanent and global, did you want a bookmark?)
   $ echo b >> b
   $ hg ci --close-branch -m'open and close'
   abort: can only close branch heads
diff --git a/tests/test-commit-multiple.t b/tests/test-commit-multiple.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1jb21taXQtbXVsdGlwbGUudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1jb21taXQtbXVsdGlwbGUudA== 100644
--- a/tests/test-commit-multiple.t
+++ b/tests/test-commit-multiple.t
@@ -52,7 +52,6 @@
   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)
diff --git a/tests/test-convert-clonebranches.t b/tests/test-convert-clonebranches.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1jb252ZXJ0LWNsb25lYnJhbmNoZXMudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1jb252ZXJ0LWNsb25lYnJhbmNoZXMudA== 100644
--- a/tests/test-convert-clonebranches.t
+++ b/tests/test-convert-clonebranches.t
@@ -55,9 +55,8 @@
   $ 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
@@ -59,9 +58,8 @@
   $ 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
@@ -69,7 +67,6 @@
   (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 ..
 
diff --git a/tests/test-convert-datesort.t b/tests/test-convert-datesort.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1jb252ZXJ0LWRhdGVzb3J0LnQ=..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1jb252ZXJ0LWRhdGVzb3J0LnQ= 100644
--- a/tests/test-convert-datesort.t
+++ b/tests/test-convert-datesort.t
@@ -21,7 +21,6 @@
   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
@@ -42,7 +41,6 @@
   $ echo c >> c
   $ hg branch branchc
   marked working directory as branch branchc
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Am c0 -d '10 0'
   adding c
   $ hg up -C brancha
diff --git a/tests/test-encoding-align.t b/tests/test-encoding-align.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1lbmNvZGluZy1hbGlnbi50..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1lbmNvZGluZy1hbGlnbi50 100644
--- a/tests/test-encoding-align.t
+++ b/tests/test-encoding-align.t
@@ -119,8 +119,7 @@
   $ hg book -f $S
   $ hg branch $M
   marked working directory as branch MIDDLE_
-  (branches are permanent and global, did you want a bookmark?)
   $ hg tag $M
   $ hg book -f $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)
@@ -123,8 +122,7 @@
   $ hg tag $M
   $ hg book -f $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
   $ hg book -f $L
 
diff --git a/tests/test-fetch.t b/tests/test-fetch.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1mZXRjaC50..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1mZXRjaC50 100644
--- a/tests/test-fetch.t
+++ b/tests/test-fetch.t
@@ -168,7 +168,6 @@
   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
@@ -363,7 +362,6 @@
   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
diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1oZ3dlYi1jb21tYW5kcy50..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1oZ3dlYi1jb21tYW5kcy50 100644
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -26,7 +26,6 @@
   $ hg ci -Ambranch
   $ hg branch unstable
   marked working directory as branch unstable
-  (branches are permanent and global, did you want a bookmark?)
   >>> open('msg', 'wb').write('branch commit with null character: \0\n')
   $ hg ci -l msg
   $ rm msg
diff --git a/tests/test-newbranch.t b/tests/test-newbranch.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1uZXdicmFuY2gudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1uZXdicmFuY2gudA== 100644
--- a/tests/test-newbranch.t
+++ b/tests/test-newbranch.t
@@ -25,7 +25,6 @@
   $ 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:
@@ -37,7 +36,6 @@
 
   $ 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
@@ -67,7 +65,6 @@
 
   $ hg branch -f bar
   marked working directory as branch bar
-  (branches are permanent and global, did you want a bookmark?)
 
   $ hg branch foo
   marked working directory as branch foo
@@ -71,7 +68,6 @@
 
   $ hg branch foo
   marked working directory as branch foo
-  (branches are permanent and global, did you want a bookmark?)
 
   $ echo bleah > a
   $ hg ci -m "modify a branch"
@@ -94,9 +90,8 @@
 
   $ hg branch default
   marked working directory as branch default
-  (branches are permanent and global, did you want a bookmark?)
 
  set (first) parent branch as branch name
 
   $ hg branch foo
   marked working directory as branch foo
@@ -98,9 +93,8 @@
 
  set (first) parent branch as branch name
 
   $ hg branch foo
   marked working directory as branch foo
-  (branches are permanent and global, did you want a bookmark?)
 
   $ hg ci -m "merge"
 
@@ -215,7 +209,6 @@
 
   $ 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
@@ -225,7 +218,6 @@
 
   $ 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'
diff --git a/tests/test-pull-branch.t b/tests/test-pull-branch.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1wdWxsLWJyYW5jaC50..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1wdWxsLWJyYW5jaC50 100644
--- a/tests/test-pull-branch.t
+++ b/tests/test-pull-branch.t
@@ -33,7 +33,6 @@
   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
 
@@ -141,7 +140,6 @@
   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
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1wdXNoLXdhcm4udA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1wdXNoLXdhcm4udA== 100644
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -462,7 +462,6 @@
   $ 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
@@ -532,7 +531,6 @@
   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
@@ -611,7 +609,6 @@
   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
@@ -703,7 +700,6 @@
   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
@@ -718,7 +714,6 @@
   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
@@ -726,7 +721,6 @@
   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
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1yZWJhc2UtY2FjaGUudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1yZWJhc2UtY2FjaGUudA== 100644
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -31,7 +31,6 @@
 
   $ 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
@@ -42,7 +41,6 @@
 
   $ 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
@@ -57,7 +55,6 @@
 
   $ 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
@@ -308,8 +305,7 @@
 
   $ hg branch branch2
   marked working directory as branch branch2
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch2'
 
   $ hg branch -f branch1
   marked working directory as branch branch1
@@ -312,8 +308,7 @@
   $ hg ci -m 'branch2'
 
   $ hg branch -f branch1
   marked working directory as branch branch1
-  (branches are permanent and global, did you want a bookmark?)
 
   $ echo a > A
   $ hg ci -Am A
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1yZWJhc2UtY29sbGFwc2UudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1yZWJhc2UtY29sbGFwc2UudA== 100644
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -571,7 +571,6 @@
 
   $ hg branch 'two'
   marked working directory as branch two
-  (branches are permanent and global, did you want a bookmark?)
   $ echo 'c' > c
   $ hg ci -Am 'C'
   adding c
diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1yZWJhc2UtbmFtZWQtYnJhbmNoZXMudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1yZWJhc2UtbmFtZWQtYnJhbmNoZXMudA== 100644
--- a/tests/test-rebase-named-branches.t
+++ b/tests/test-rebase-named-branches.t
@@ -36,7 +36,6 @@
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg branch dev-two
   marked working directory as branch dev-two
-  (branches are permanent and global, did you want a bookmark?)
 
   $ echo x > x
 
@@ -128,7 +127,6 @@
   3 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg branch dev-one
   marked working directory as branch dev-one
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'dev-one named branch'
 
   $ hg tglog
diff --git a/tests/test-revset.t b/tests/test-revset.t
index ab618e52788a6dc09202d812b454327404aa13ef_dGVzdHMvdGVzdC1yZXZzZXQudA==..701df761aa9428911b2ae48cd5d97e9c5a6ad1fd_dGVzdHMvdGVzdC1yZXZzZXQudA== 100644
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -43,9 +43,8 @@
   $ 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-
@@ -47,9 +46,8 @@
   $ 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 log -r "extra('branch', 'a-b-c-')" --template '{rev}\n'
@@ -66,7 +64,6 @@
   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
@@ -74,10 +71,9 @@
   $ 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/
@@ -78,10 +74,9 @@
   $ 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
@@ -89,8 +84,7 @@
   (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.
@@ -93,9 +87,8 @@
   $ 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
@@ -98,10 +91,9 @@
   $ hg ci -Aqm7
 
   $ hg branch all
   marked working directory as branch all
-  (branches are permanent and global, did you want a bookmark?)
 
   $ hg co 4
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch é
   marked working directory as branch \xc3\xa9 (esc)
@@ -103,9 +95,8 @@
 
   $ hg co 4
   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