Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-mq.t
changeset 45771 f90a5c211251
parent 45150 dc5e5577af39
child 45826 21733e8c924f 
--- a/tests/test-rebase-mq.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-mq.t	Tue Oct 27 15:33:15 2020 -0700
@@ -59,7 +59,7 @@
 Rebase - generate a conflict:
 
   $ hg rebase -s 2 -d 1
-  rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
+  rebasing 2:3504f44bffc0 f.patch qbase "P0"
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -72,8 +72,8 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
-  rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
+  rebasing 2:3504f44bffc0 f.patch qbase "P0"
+  rebasing 3:929394423cd3 f2.patch qtip tip "P1"
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -86,8 +86,8 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
-  rebasing 3:929394423cd3 "P1" (f2.patch qtip)
+  already rebased 2:3504f44bffc0 f.patch qbase "P0" as ebe9914c0d1c
+  rebasing 3:929394423cd3 f2.patch qtip "P1"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg
 
   $ hg tglog
@@ -203,8 +203,8 @@
 Rebase the applied mq patches:
 
   $ hg rebase -s 2 -d 1
-  rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase)
-  rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip)
+  rebasing 2:0c587ffcb480 f_git.patch qbase "P0 (git)"
+  rebasing 3:c7f18665e4bc f.patch qtip tip "P1"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg
 
   $ hg qci -m 'save patch state'
@@ -337,7 +337,7 @@
   foo
   $ [ -f .hg/patches/empty-important ]
   $ hg -q rebase -d 2
-  note: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes
+  note: not rebasing 1:0aaf4c3af7eb empty-important qbase "important commit message", its destination already has all its changes
   $ hg qseries
   guarded
   bar
mercurial