154 searching for changes |
154 searching for changes |
155 adding changesets |
155 adding changesets |
156 adding manifests |
156 adding manifests |
157 adding file changes |
157 adding file changes |
158 added 1 changesets with 1 changes to 1 files |
158 added 1 changesets with 1 changes to 1 files |
|
159 % qpush/qpop error codes |
|
160 applying test.patch |
|
161 applying test1b.patch |
|
162 applying test2.patch |
|
163 Now at: test2.patch |
|
164 % pops all patches and succeeds |
|
165 Patch queue now empty |
|
166 qpop -a succeeds |
|
167 % does nothing and succeeds |
|
168 no patches applied |
|
169 qpop -a succeeds |
|
170 % fails - nothing else to pop |
|
171 no patches applied |
|
172 qpop fails |
|
173 % pushes a patch and succeeds |
|
174 applying test.patch |
|
175 Now at: test.patch |
|
176 qpush succeeds |
|
177 % pops a patch and succeeds |
|
178 Patch queue now empty |
|
179 qpop succeeds |
|
180 % pushes up to test1b.patch and succeeds |
|
181 applying test.patch |
|
182 applying test1b.patch |
|
183 Now at: test1b.patch |
|
184 qpush test1b.patch succeeds |
|
185 % does nothing and succeeds |
|
186 qpush: test1b.patch is already at the top |
|
187 qpush test1b.patch succeeds |
|
188 % does nothing and succeeds |
|
189 qpop: test1b.patch is already at the top |
|
190 qpop test1b.patch succeeds |
|
191 % fails - can't push to this patch |
|
192 abort: cannot push to a previous patch: test.patch |
|
193 qpush test.patch fails |
|
194 % fails - can't pop to this patch |
|
195 abort: patch test2.patch is not applied |
|
196 qpop test2.patch fails |
|
197 % pops up to test.patch and succeeds |
|
198 Now at: test.patch |
|
199 qpop test.patch succeeds |
|
200 % pushes all patches and succeeds |
|
201 applying test1b.patch |
|
202 applying test2.patch |
|
203 Now at: test2.patch |
|
204 qpush -a succeeds |
|
205 % does nothing and succeeds |
|
206 all patches are currently applied |
|
207 qpush -a succeeds |
|
208 % fails - nothing else to push |
|
209 patch series already fully applied |
|
210 qpush fails |
|
211 % does nothing and succeeds |
|
212 all patches are currently applied |
|
213 qpush test2.patch succeeds |
159 % strip |
214 % strip |
160 adding x |
215 adding x |
161 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
216 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
162 saving bundle to |
217 saving bundle to |
163 adding changesets |
218 adding changesets |