diff --git a/tests/test-rebase-mq b/tests/test-rebase-mq index 59bd20451ab68fdac8bb329b814cc004615554cf_dGVzdHMvdGVzdC1yZWJhc2UtbXE=..92342fa9fbd83933f2bf6f74db23ce91c61c37c9_dGVzdHMvdGVzdC1yZWJhc2UtbXE= 100755 --- a/tests/test-rebase-mq +++ b/tests/test-rebase-mq @@ -101,6 +101,11 @@ hg qnew f.patch echo 'mq2' > p hg qref -m 'P1' +hg qcommit -m 'save patch state' +echo '% patch series step 1/2' +hg qseries -s +echo '% patch queue manifest step 1/2' +hg -R .hg/patches manifest echo '% Git patch' cat .hg/patches/f_git.patch | filterpatch @@ -112,6 +117,11 @@ echo echo '% Rebase the applied mq patches' hg rebase -s 2 -d 1 --quiet +hg qcommit -m 'save patch state' +echo '% patch series step 2/2' +hg qseries -s +echo '% patch queue manifest step 2/2' +hg -R .hg/patches manifest echo '% And the patches are correct' echo '% Git patch' diff --git a/tests/test-rebase-mq.out b/tests/test-rebase-mq.out index 59bd20451ab68fdac8bb329b814cc004615554cf_dGVzdHMvdGVzdC1yZWJhc2UtbXEub3V0..92342fa9fbd83933f2bf6f74db23ce91c61c37c9_dGVzdHMvdGVzdC1yZWJhc2UtbXEub3V0 100644 --- a/tests/test-rebase-mq.out +++ b/tests/test-rebase-mq.out @@ -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