equal
deleted
inserted
replaced
99 hg qref --git -m 'P0 (git)' |
99 hg qref --git -m 'P0 (git)' |
100 |
100 |
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 |
107 |
112 |
108 echo |
113 echo |
110 cat .hg/patches/f.patch | filterpatch |
115 cat .hg/patches/f.patch | filterpatch |
111 |
116 |
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' |
118 cat .hg/patches/f_git.patch | filterpatch |
128 cat .hg/patches/f_git.patch | filterpatch |
119 |
129 |