--- a/tests/test-mq-subrepo.t Thu Oct 15 21:36:47 2015 +0200
+++ b/tests/test-mq-subrepo.t Tue Mar 10 13:19:17 2015 +0100
@@ -249,8 +249,8 @@
reverting subrepo sub
adding sub/a (glob)
$ hg qpop
- popping 1.diff
- now at: 0.diff
+ popping 1
+ now at: 0
$ hg status -AS
C .hgsub
C .hgsubstate
@@ -268,11 +268,11 @@
reverting subrepo sub
adding sub/a (glob)
$ hg qpush
- applying 1.diff
+ applying 1
subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba)
(M)erge, keep (l)ocal or keep (r)emote? m
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- now at: 1.diff
+ now at: 1
$ hg status -AS
C .hgsub
C .hgsubstate