--- a/tests/test-convert-filemap.t Mon Dec 05 17:09:11 2011 -0600
+++ b/tests/test-convert-filemap.t Thu Dec 08 14:32: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