Mercurial > hg
changeset 11536:92342fa9fbd8 stable
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 | 59bd20451ab6 |
| children | 0a044e5ff489 |
| files | tests/test-rebase-mq tests/test-rebase-mq.out |
| diffstat | 2 files changed, 26 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-mq Tue Jul 13 20:12:32 2010 +0900 +++ b/tests/test-rebase-mq Mon Jul 12 09:19:28 2010 +0300 @@ -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'
--- 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