mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
rebase: add a test for committed MQ patches (9738fa24c874)
This commit is contained in:
parent
a34bba6494
commit
0e555f2d40
@ -101,6 +101,11 @@ hg qref --git -m 'P0 (git)'
|
||||
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 @@ cat .hg/patches/f.patch | filterpatch
|
||||
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'
|
||||
|
@ -80,6 +80,14 @@ popping f2.patch
|
||||
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 @@ diff -r x p
|
||||
+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
|
||||
|
Loading…
Reference in New Issue
Block a user