Mercurial > hg

diff tests/test-rebase-mq.out @ 11536:92342fa9fbd8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add a test for committed MQ patches (59bd20451ab6)
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Mon, 12 Jul 2010 09:19:28 +0300
parents 7a9cf012dddc
children
line wrap: on
line diff
--- a/tests/test-rebase-mq.out	Tue Jul 13 20:12:32 2010 +0900
+++ b/tests/test-rebase-mq.out	Mon Jul 12 09:19:28 2010 +0300
@@ -80,6 +80,14 @@
 popping f.patch
 patch queue now empty
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% patch series step 1/2
+f_git.patch: P0 (git)
+f.patch: P1
+% patch queue manifest step 1/2
+.hgignore
+f.patch
+f_git.patch
+series
 % Git patch
 P0 (git)
 
@@ -101,6 +109,14 @@
 +mq2
 
 % Rebase the applied mq patches
+% patch series step 2/2
+f_git.patch: P0 (git)
+f.patch: P1
+% patch queue manifest step 2/2
+.hgignore
+f.patch
+f_git.patch
+series
 % And the patches are correct
 % Git patch
 # HG changeset patch