--- a/tests/test-rebase-mq-skip.t Thu Oct 15 21:36:47 2015 +0200
+++ b/tests/test-rebase-mq-skip.t Tue Mar 10 13:19:17 2015 +0100
@@ -142,12 +142,12 @@
$ hg up -q qtip
$ HGMERGE=internal:fail hg rebase
- rebasing 1:b4bffa6e4776 "r1" (1.diff qbase)
+ rebasing 1:b4bffa6e4776 "r1" (qbase r1)
note: rebase of 1:b4bffa6e4776 created no changes to commit
- rebasing 2:c0fd129beb01 "r2" (2.diff)
- rebasing 3:6ff5b8feed8e "r3" (3.diff)
+ rebasing 2:c0fd129beb01 "r2" (r2)
+ rebasing 3:6ff5b8feed8e "r3" (r3)
note: rebase of 3:6ff5b8feed8e created no changes to commit
- rebasing 4:094320fec554 "r4" (4.diff)
+ rebasing 4:094320fec554 "r4" (r4)
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -155,20 +155,20 @@
(no more unresolved files)
$ hg rebase --continue
- already rebased 1:b4bffa6e4776 "r1" (1.diff qbase) as 057f55ff8f44
- already rebased 2:c0fd129beb01 "r2" (2.diff) as 1660ab13ce9a
- already rebased 3:6ff5b8feed8e "r3" (3.diff) as 1660ab13ce9a
- rebasing 4:094320fec554 "r4" (4.diff)
+ already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
+ already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
+ already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
+ rebasing 4:094320fec554 "r4" (r4)
note: rebase of 4:094320fec554 created no changes to commit
- rebasing 5:681a378595ba "r5" (5.diff)
- rebasing 6:512a1f24768b "r6" (6.diff qtip)
+ rebasing 5:681a378595ba "r5" (r5)
+ rebasing 6:512a1f24768b "r6" (qtip r6)
note: rebase of 6:512a1f24768b created no changes to commit
saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-backup.hg (glob)
$ hg tglog
- @ 8: 'r5' tags: 5.diff qtip tip
+ @ 8: 'r5' tags: qtip r5 tip
|
- o 7: 'r2' tags: 2.diff qbase
+ o 7: 'r2' tags: qbase r2
|
o 6: 'branch2-r6' tags: qparent
|