##// END OF EJS Templates
rebase: add a test for committed MQ patches (59bd20451ab6)
Giorgos Keramidas -
r11536:92342fa9 stable
parent child Browse files
Show More
@@ -101,6 +101,11 b" hg qref --git -m 'P0 (git)'"
101 hg qnew f.patch
101 hg qnew f.patch
102 echo 'mq2' > p
102 echo 'mq2' > p
103 hg qref -m 'P1'
103 hg qref -m 'P1'
104 hg qcommit -m 'save patch state'
105 echo '% patch series step 1/2'
106 hg qseries -s
107 echo '% patch queue manifest step 1/2'
108 hg -R .hg/patches manifest
104
109
105 echo '% Git patch'
110 echo '% Git patch'
106 cat .hg/patches/f_git.patch | filterpatch
111 cat .hg/patches/f_git.patch | filterpatch
@@ -112,6 +117,11 b' cat .hg/patches/f.patch | filterpatch'
112 echo
117 echo
113 echo '% Rebase the applied mq patches'
118 echo '% Rebase the applied mq patches'
114 hg rebase -s 2 -d 1 --quiet
119 hg rebase -s 2 -d 1 --quiet
120 hg qcommit -m 'save patch state'
121 echo '% patch series step 2/2'
122 hg qseries -s
123 echo '% patch queue manifest step 2/2'
124 hg -R .hg/patches manifest
115
125
116 echo '% And the patches are correct'
126 echo '% And the patches are correct'
117 echo '% Git patch'
127 echo '% Git patch'
@@ -80,6 +80,14 b' popping f2.patch'
80 popping f.patch
80 popping f.patch
81 patch queue now empty
81 patch queue now empty
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83 % patch series step 1/2
84 f_git.patch: P0 (git)
85 f.patch: P1
86 % patch queue manifest step 1/2
87 .hgignore
88 f.patch
89 f_git.patch
90 series
83 % Git patch
91 % Git patch
84 P0 (git)
92 P0 (git)
85
93
@@ -101,6 +109,14 b' diff -r x p'
101 +mq2
109 +mq2
102
110
103 % Rebase the applied mq patches
111 % Rebase the applied mq patches
112 % patch series step 2/2
113 f_git.patch: P0 (git)
114 f.patch: P1
115 % patch queue manifest step 2/2
116 .hgignore
117 f.patch
118 f_git.patch
119 series
104 % And the patches are correct
120 % And the patches are correct
105 % Git patch
121 % Git patch
106 # HG changeset patch
122 # HG changeset patch
General Comments 0
You need to be logged in to leave comments. Login now