--- a/tests/test-rebase-mq-skip.t Tue Dec 09 03:45:26 2014 +0100
+++ b/tests/test-rebase-mq-skip.t Wed Dec 10 06:20:35 2014 +0100
@@ -52,6 +52,7 @@
$ hg rebase
rebasing 2:13a46ce44f60 "P0" (p0.patch qbase)
rebasing 3:148775c71080 "P1" (p1.patch qtip)
+ note: rebase of 3:148775c71080 created no changes to commit
saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob)
$ hg tglog
@@ -110,8 +111,10 @@
$ HGMERGE=internal:fail hg rebase
rebasing 1:b4bffa6e4776 "r1" (1.diff qbase)
+ note: rebase of 1:b4bffa6e4776 created no changes to commit
rebasing 2:c0fd129beb01 "r2" (2.diff)
rebasing 3:6ff5b8feed8e "r3" (3.diff)
+ note: rebase of 3:6ff5b8feed8e created no changes to commit
rebasing 4:094320fec554 "r4" (4.diff)
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -124,8 +127,10 @@
already rebased 2:c0fd129beb01 "r2" (2.diff) as 1660ab13ce9a
already rebased 3:6ff5b8feed8e "r3" (3.diff) as 1660ab13ce9a
rebasing 4:094320fec554 "r4" (4.diff)
+ note: rebase of 4:094320fec554 created no changes to commit
rebasing 5:681a378595ba "r5" (5.diff)
rebasing 6:512a1f24768b "r6" (6.diff qtip)
+ note: rebase of 6:512a1f24768b created no changes to commit
saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-backup.hg (glob)
$ hg tglog