equal
deleted
inserted
replaced
199 $ hg qpop --force --no-backup --verbose |
199 $ hg qpop --force --no-backup --verbose |
200 popping p1 |
200 popping p1 |
201 patch queue now empty |
201 patch queue now empty |
202 $ test -f a.orig && echo 'error: backup with --no-backup' |
202 $ test -f a.orig && echo 'error: backup with --no-backup' |
203 [1] |
203 [1] |
|
204 |
|
205 test qpop --check |
|
206 |
|
207 $ hg qpush |
|
208 applying p1 |
|
209 now at: p1 |
|
210 $ hg qpop --check --force |
|
211 abort: cannot use both --force and --check |
|
212 [255] |
|
213 $ echo a >> a |
|
214 $ hg qpop --check |
|
215 abort: local changes found, refresh first |
|
216 [255] |
|
217 $ hg revert -qa a |
|
218 $ rm a |
|
219 $ hg qpop --check |
|
220 abort: local changes found, refresh first |
|
221 [255] |
|
222 $ hg rm -A a |
|
223 $ hg qpop --check |
|
224 abort: local changes found, refresh first |
|
225 [255] |
|
226 $ hg revert -qa a |
|
227 $ echo b > b |
|
228 $ hg add b |
|
229 $ hg qpop --check |
|
230 abort: local changes found, refresh first |
|
231 [255] |
|
232 $ hg forget b |
|
233 $ echo d > d |
|
234 $ hg add d |
|
235 $ hg qpop --check |
|
236 popping p1 |
|
237 patch queue now empty |
|
238 $ hg forget d |
|
239 $ rm d |
204 |
240 |
205 test qpush --force and backup files |
241 test qpush --force and backup files |
206 |
242 |
207 $ echo a >> a |
243 $ echo a >> a |
208 $ hg qnew p2 |
244 $ hg qnew p2 |