equal
deleted
inserted
replaced
442 applying p3 |
442 applying p3 |
443 now at: p3 |
443 now at: p3 |
444 $ hg st a |
444 $ hg st a |
445 M a |
445 M a |
446 $ echo b >> b |
446 $ echo b >> b |
447 $ hg --config mq.keepchanges=1 qpop --force |
447 $ hg --config mq.keepchanges=1 qpop --force --config 'ui.origbackuppath=.hg/origbackups' |
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, qrefresh first |
452 abort: local changes found, qrefresh first |
459 $ hg --config mq.keepchanges=1 qpush --force |
459 $ hg --config mq.keepchanges=1 qpush --force |
460 applying p2 |
460 applying p2 |
461 now at: p2 |
461 now at: p2 |
462 $ hg st a |
462 $ hg st a |
463 |
463 |
|
464 test previous qpop (with --force and --config) saved .orig files to where user |
|
465 wants them |
|
466 $ ls .hg/origbackups |
|
467 b.orig |
|
468 $ rm -rf .hg/origbackups |
|
469 |
464 $ cd .. |
470 $ cd .. |