--- a/tests/test-encoding-align.t Sat Mar 08 19:02:39 2014 +1100
+++ b/tests/test-encoding-align.t Tue May 27 17:41:20 2014 -0700
@@ -116,22 +116,25 @@
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 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)
(branches are permanent and global, did you want a bookmark?)
$ hg tag $L
+ $ hg book -f $L
check alignment of branches
- $ hg tags
- tip 5:d745ff46155b
- \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 4:9259be597f19 (esc)
- MIDDLE_ 3:b06c5b6def9e
- \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc)
+ $ hg branches
+ \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc)
+ MIDDLE_ 4:9259be597f19 (inactive)
+ \xe7\x9f\xad\xe5\x90\x8d 3:b06c5b6def9e (inactive) (esc)
+ default 2:64a70663cee8 (inactive)
check alignment of tags
@@ -141,4 +144,9 @@
MIDDLE_ 3:b06c5b6def9e
\xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc)
- $ cd ..
+check alignment of bookmarks
+
+ $ hg book
+ MIDDLE_ 5:d745ff46155b
+ \xe7\x9f\xad\xe5\x90\x8d 4:9259be597f19 (esc)
+ * \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc)