diff options
Diffstat (limited to 'tests/test-mq-qpush-fail.t')
| -rw-r--r-- | tests/test-mq-qpush-fail.t | 274 |
1 files changed, 0 insertions, 274 deletions
diff --git a/tests/test-mq-qpush-fail.t b/tests/test-mq-qpush-fail.t index 44379cd..0521381 100644 --- a/tests/test-mq-qpush-fail.t +++ b/tests/test-mq-qpush-fail.t @@ -150,277 +150,3 @@ and now we try it one more time with a unguarded, while we're not at the top of abort: cannot push to a previous patch: a [255] -test qpop --force and backup files - - $ hg qpop -a - popping b - patch queue now empty - $ hg qq --create force - $ echo a > a - $ echo b > b - $ echo c > c - $ hg ci -Am add a b c - $ echo a >> a - $ hg rm b - $ hg rm c - $ hg qnew p1 - $ echo a >> a - $ echo bb > b - $ hg add b - $ echo cc > c - $ hg add c - $ hg qpop --force --verbose - saving current version of a as a.orig - saving current version of b as b.orig - saving current version of c as c.orig - popping p1 - patch queue now empty - $ hg st - ? a.orig - ? b.orig - ? c.orig - ? untracked-file - $ cat a.orig - a - a - a - $ cat b.orig - bb - $ cat c.orig - cc - -test qpop --force --no-backup - - $ hg qpush - applying p1 - now at: p1 - $ rm a.orig - $ echo a >> a - $ hg qpop --force --no-backup --verbose - popping p1 - patch queue now empty - $ test -f a.orig && echo 'error: backup with --no-backup' - [1] - -test qpop --keep-changes - - $ hg qpush - applying p1 - now at: p1 - $ hg qpop --keep-changes --force - abort: cannot use both --force and --keep-changes - [255] - $ echo a >> a - $ hg qpop --keep-changes - abort: local changes found, refresh first - [255] - $ hg revert -qa a - $ rm a - $ hg qpop --keep-changes - abort: local changes found, refresh first - [255] - $ hg rm -A a - $ hg qpop --keep-changes - abort: local changes found, refresh first - [255] - $ hg revert -qa a - $ echo b > b - $ hg add b - $ hg qpop --keep-changes - abort: local changes found, refresh first - [255] - $ hg forget b - $ echo d > d - $ hg add d - $ hg qpop --keep-changes - popping p1 - patch queue now empty - $ hg forget d - $ rm d - -test qpush --force and backup files - - $ echo a >> a - $ hg qnew p2 - $ echo b >> b - $ echo d > d - $ echo e > e - $ hg add d e - $ hg rm c - $ hg qnew p3 - $ hg qpop -a - popping p3 - popping p2 - patch queue now empty - $ echo a >> a - $ echo b1 >> b - $ echo d1 > d - $ hg add d - $ echo e1 > e - $ hg qpush -a --force --verbose - applying p2 - saving current version of a as a.orig - patching file a - a - applying p3 - saving current version of b as b.orig - saving current version of d as d.orig - patching file b - patching file c - patching file d - file d already exists - 1 out of 1 hunks FAILED -- saving rejects to file d.rej - patching file e - file e already exists - 1 out of 1 hunks FAILED -- saving rejects to file e.rej - patch failed to apply - b - patch failed, rejects left in working dir - errors during apply, please fix and refresh p3 - [2] - $ cat a.orig - a - a - $ cat b.orig - b - b1 - $ cat d.orig - d1 - -test qpush --force --no-backup - - $ hg revert -qa - $ hg qpop -a - popping p3 - popping p2 - patch queue now empty - $ echo a >> a - $ rm a.orig - $ hg qpush --force --no-backup --verbose - applying p2 - patching file a - a - now at: p2 - $ test -f a.orig && echo 'error: backup with --no-backup' - [1] - -test qgoto --force --no-backup - - $ hg qpop - popping p2 - patch queue now empty - $ echo a >> a - $ hg qgoto --force --no-backup p2 --verbose - applying p2 - patching file a - a - now at: p2 - $ test -f a.orig && echo 'error: backup with --no-backup' - [1] - -test qpush --keep-changes - - $ hg qpush --keep-changes --force - abort: cannot use both --force and --keep-changes - [255] - $ hg qpush --keep-changes --exact - abort: cannot use --exact and --keep-changes together - [255] - $ echo b >> b - $ hg qpush --keep-changes - applying p3 - errors during apply, please fix and refresh p2 - [2] - $ rm b - $ hg qpush --keep-changes - applying p3 - errors during apply, please fix and refresh p2 - [2] - $ hg rm -A b - $ hg qpush --keep-changes - applying p3 - errors during apply, please fix and refresh p2 - [2] - $ hg revert -aq b - $ echo d > d - $ hg add d - $ hg qpush --keep-changes - applying p3 - errors during apply, please fix and refresh p2 - [2] - $ hg forget d - $ rm d - $ hg qpop - popping p2 - patch queue now empty - $ echo b >> b - $ hg qpush -a --keep-changes - applying p2 - applying p3 - errors during apply, please fix and refresh p2 - [2] - $ hg qtop - p2 - $ hg parents --template "{rev} {desc}\n" - 2 imported patch p2 - $ hg st b - M b - $ cat b - b - b - -test qgoto --keep-changes - - $ hg revert -aq b - $ rm e - $ hg qgoto --keep-changes --force p3 - abort: cannot use both --force and --keep-changes - [255] - $ echo a >> a - $ hg qgoto --keep-changes p3 - applying p3 - now at: p3 - $ hg st a - M a - $ hg qgoto --keep-changes p2 - popping p3 - now at: p2 - $ hg st a - M a - -test mq.keepchanges setting - - $ hg --config mq.keepchanges=1 qpush - applying p3 - now at: p3 - $ hg st a - M a - $ hg --config mq.keepchanges=1 qpop - popping p3 - now at: p2 - $ hg st a - M a - $ hg --config mq.keepchanges=1 qgoto p3 - applying p3 - now at: p3 - $ hg st a - M a - $ echo b >> b - $ hg --config mq.keepchanges=1 qpop --force - popping p3 - now at: p2 - $ hg st b - $ hg --config mq.keepchanges=1 qpush --exact - abort: local changes found, refresh first - [255] - $ hg revert -qa a - $ hg qpop - popping p2 - patch queue now empty - $ echo a >> a - $ hg --config mq.keepchanges=1 qpush --force - applying p2 - now at: p2 - $ hg st a - - $ cd .. |