151 applying b.diff |
151 applying b.diff |
152 now at: b.diff |
152 now at: b.diff |
153 |
153 |
154 try to import --push |
154 try to import --push |
155 |
155 |
156 $ echo another >> b |
156 $ cat > appendfoo.diff <<EOF |
157 $ hg diff > another.diff |
157 > append foo |
158 $ hg up -C |
158 > |
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 > diff -r 07f494440405 -r 261500830e46 baz |
160 $ hg qimport --push another.diff |
160 > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
161 adding another.diff to series file |
161 > +++ b/baz Thu Jan 01 00:00:00 1970 +0000 |
162 applying another.diff |
162 > @@ -0,0 +1,1 @@ |
163 now at: another.diff |
163 > +foo |
|
164 > EOF |
|
165 |
|
166 $ cat > appendbar.diff <<EOF |
|
167 > append bar |
|
168 > |
|
169 > diff -r 07f494440405 -r 261500830e46 baz |
|
170 > --- a/baz Thu Jan 01 00:00:00 1970 +0000 |
|
171 > +++ b/baz Thu Jan 01 00:00:00 1970 +0000 |
|
172 > @@ -1,1 +1,2 @@ |
|
173 > foo |
|
174 > +bar |
|
175 > EOF |
|
176 |
|
177 $ hg qimport --push appendfoo.diff appendbar.diff |
|
178 adding appendfoo.diff to series file |
|
179 adding appendbar.diff to series file |
|
180 applying appendfoo.diff |
|
181 applying appendbar.diff |
|
182 now at: appendbar.diff |
164 $ hg qfin -a |
183 $ hg qfin -a |
165 patch b.diff finalized without changeset message |
184 patch b.diff finalized without changeset message |
166 patch another.diff finalized without changeset message |
185 $ hg qimport -r 'p1(.)::' -P |
167 $ hg qimport -rtip -P |
|
168 $ hg qpop -a |
186 $ hg qpop -a |
|
187 popping 3.diff |
169 popping 2.diff |
188 popping 2.diff |
170 patch queue now empty |
189 patch queue now empty |
|
190 $ hg qdel 3.diff |
171 $ hg qdel -k 2.diff |
191 $ hg qdel -k 2.diff |
172 |
192 |
173 qimport -e |
193 qimport -e |
174 |
194 |
175 $ hg qimport -e 2.diff |
195 $ hg qimport -e 2.diff |