Mercurial > public > mercurial-scm > hg
diff tests/test-mq-qpush-fail.t @ 16733:4da10c00a20c
mq: rename --check into --keep-changes
I named it --check because it felt like qpush & co were checking *more*
things to ensure local changes could not be lost. But it has been
pointed on the mailing list that --check is already used by update
command with a meaning almost opposite to this one. An alternative
was --keep but qfold and qdelete already have such an option to preserve
patch files and qfold may be a candidate for --check.
- qpush/qpop/qgoto --check becomes --keep-changes.
- mq.check becomes mq.keepchanges.
- The short option -c is dropped as -k may conflict with existing
--keep. The availabilitity of mq.keepchanges should not make this too
painful.
- Fix minor reST mistake in option description.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 13 May 2012 14:00:58 +0200 |
| parents | 4ae3ba9e4d7a |
| children | f2719b387380 |
line wrap: on
line diff
--- a/tests/test-mq-qpush-fail.t Sun May 13 11:56:50 2012 +0200 +++ b/tests/test-mq-qpush-fail.t Sun May 13 14:00:58 2012 +0200 @@ -202,37 +202,37 @@ $ test -f a.orig && echo 'error: backup with --no-backup' [1] -test qpop --check +test qpop --keep-changes $ hg qpush applying p1 now at: p1 - $ hg qpop --check --force - abort: cannot use both --force and --check + $ hg qpop --keep-changes --force + abort: cannot use both --force and --keep-changes [255] $ echo a >> a - $ hg qpop --check + $ hg qpop --keep-changes abort: local changes found, refresh first [255] $ hg revert -qa a $ rm a - $ hg qpop --check + $ hg qpop --keep-changes abort: local changes found, refresh first [255] $ hg rm -A a - $ hg qpop --check + $ hg qpop --keep-changes abort: local changes found, refresh first [255] $ hg revert -qa a $ echo b > b $ hg add b - $ hg qpop --check + $ hg qpop --keep-changes abort: local changes found, refresh first [255] $ hg forget b $ echo d > d $ hg add d - $ hg qpop --check + $ hg qpop --keep-changes popping p1 patch queue now empty $ hg forget d @@ -318,33 +318,33 @@ $ test -f a.orig && echo 'error: backup with --no-backup' [1] -test qpush --check +test qpush --keep-changes - $ hg qpush --check --force - abort: cannot use both --force and --check + $ hg qpush --keep-changes --force + abort: cannot use both --force and --keep-changes [255] - $ hg qpush --check --exact - abort: cannot use --exact and --check together + $ hg qpush --keep-changes --exact + abort: cannot use --exact and --keep-changes together [255] $ echo b >> b - $ hg qpush --check + $ hg qpush --keep-changes applying p3 errors during apply, please fix and refresh p2 [2] $ rm b - $ hg qpush --check + $ hg qpush --keep-changes applying p3 errors during apply, please fix and refresh p2 [2] $ hg rm -A b - $ hg qpush --check + $ 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 --check + $ hg qpush --keep-changes applying p3 errors during apply, please fix and refresh p2 [2] @@ -354,7 +354,7 @@ popping p2 patch queue now empty $ echo b >> b - $ hg qpush -a --check + $ hg qpush -a --keep-changes applying p2 applying p3 errors during apply, please fix and refresh p2 @@ -369,48 +369,48 @@ b b -test qgoto --check +test qgoto --keep-changes $ hg revert -aq b $ rm e - $ hg qgoto --check --force p3 - abort: cannot use both --force and --check + $ hg qgoto --keep-changes --force p3 + abort: cannot use both --force and --keep-changes [255] $ echo a >> a - $ hg qgoto --check p3 + $ hg qgoto --keep-changes p3 applying p3 now at: p3 $ hg st a M a - $ hg qgoto --check p2 + $ hg qgoto --keep-changes p2 popping p3 now at: p2 $ hg st a M a -test mq.check setting +test mq.keepchanges setting - $ hg --config mq.check=1 qpush + $ hg --config mq.keepchanges=1 qpush applying p3 now at: p3 $ hg st a M a - $ hg --config mq.check=1 qpop + $ hg --config mq.keepchanges=1 qpop popping p3 now at: p2 $ hg st a M a - $ hg --config mq.check=1 qgoto p3 + $ hg --config mq.keepchanges=1 qgoto p3 applying p3 now at: p3 $ hg st a M a $ echo b >> b - $ hg --config mq.check=1 qpop --force + $ hg --config mq.keepchanges=1 qpop --force popping p3 now at: p2 $ hg st b - $ hg --config mq.check=1 qpush --exact + $ hg --config mq.keepchanges=1 qpush --exact abort: local changes found, refresh first [255] $ hg revert -qa a @@ -418,7 +418,7 @@ popping p2 patch queue now empty $ echo a >> a - $ hg --config mq.check=1 qpush --force + $ hg --config mq.keepchanges=1 qpush --force applying p2 now at: p2 $ hg st a