--- a/tests/test-rebase-collapse.t Mon Nov 04 19:59:00 2013 -0800
+++ b/tests/test-rebase-collapse.t Fri Nov 01 17:08:06 2013 -0700
@@ -57,11 +57,11 @@
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglogp
- o 5:secret 'Collapsed revision
+ @ 5:secret 'Collapsed revision
| * B
| * C
| * D'
- @ 4:draft 'H'
+ o 4:draft 'H'
|
| o 3:draft 'G'
|/|
@@ -737,12 +737,13 @@
$ touch b
$ hg commit -Am b
adding b
+ $ hg book foo
$ hg rebase -d 0 -r "1::2" --collapse -m collapsed
saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob)
- $ hg tglog
- o 1: 'collapsed'
+ $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
+ @ 1: 'collapsed' foo
|
- @ 0: 'base'
+ o 0: 'base'
$ hg manifest --rev tip
b