equal
deleted
inserted
replaced
231 $ hg qpop --keep-changes --force |
231 $ hg qpop --keep-changes --force |
232 abort: cannot use both --force and --keep-changes |
232 abort: cannot use both --force and --keep-changes |
233 [255] |
233 [255] |
234 $ echo a >> a |
234 $ echo a >> a |
235 $ hg qpop --keep-changes |
235 $ hg qpop --keep-changes |
236 abort: local changes found, refresh first |
236 abort: local changes found, qrefresh first |
237 [255] |
237 [255] |
238 $ hg revert -qa a |
238 $ hg revert -qa a |
239 $ rm a |
239 $ rm a |
240 $ hg qpop --keep-changes |
240 $ hg qpop --keep-changes |
241 abort: local changes found, refresh first |
241 abort: local changes found, qrefresh first |
242 [255] |
242 [255] |
243 $ hg rm -A a |
243 $ hg rm -A a |
244 $ hg qpop --keep-changes |
244 $ hg qpop --keep-changes |
245 abort: local changes found, refresh first |
245 abort: local changes found, qrefresh first |
246 [255] |
246 [255] |
247 $ hg revert -qa a |
247 $ hg revert -qa a |
248 $ echo b > b |
248 $ echo b > b |
249 $ hg add b |
249 $ hg add b |
250 $ hg qpop --keep-changes |
250 $ hg qpop --keep-changes |
251 abort: local changes found, refresh first |
251 abort: local changes found, qrefresh first |
252 [255] |
252 [255] |
253 $ hg forget b |
253 $ hg forget b |
254 $ echo d > d |
254 $ echo d > d |
255 $ hg add d |
255 $ hg add d |
256 $ hg qpop --keep-changes |
256 $ hg qpop --keep-changes |
301 committing files: |
301 committing files: |
302 b |
302 b |
303 committing manifest |
303 committing manifest |
304 committing changelog |
304 committing changelog |
305 patch failed, rejects left in working directory |
305 patch failed, rejects left in working directory |
306 errors during apply, please fix and refresh p3 |
306 errors during apply, please fix and qrefresh p3 |
307 [2] |
307 [2] |
308 $ cat a.orig |
308 $ cat a.orig |
309 a |
309 a |
310 a |
310 a |
311 $ cat b.orig |
311 $ cat b.orig |
447 $ hg --config mq.keepchanges=1 qpop --force |
447 $ hg --config mq.keepchanges=1 qpop --force |
448 popping p3 |
448 popping p3 |
449 now at: p2 |
449 now at: p2 |
450 $ hg st b |
450 $ hg st b |
451 $ hg --config mq.keepchanges=1 qpush --exact |
451 $ hg --config mq.keepchanges=1 qpush --exact |
452 abort: local changes found, refresh first |
452 abort: local changes found, qrefresh first |
453 [255] |
453 [255] |
454 $ hg revert -qa a |
454 $ hg revert -qa a |
455 $ hg qpop |
455 $ hg qpop |
456 popping p2 |
456 popping p2 |
457 patch queue now empty |
457 patch queue now empty |