Mercurial > public > mercurial-scm > hg
diff tests/test-mq.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 | 8149ff405c78 |
line wrap: on
line diff
--- a/tests/test-mq.t Sun May 13 11:56:50 2012 +0200 +++ b/tests/test-mq.t Sun May 13 14:00:58 2012 +0200 @@ -62,9 +62,10 @@ If the working directory contains uncommitted files, qpush, qpop and qgoto abort immediately. If -f/--force is used, the changes are discarded. Setting: - [mq] check = True + [mq] + keepchanges = True - make them behave as if -c/--check were passed, and non-conflicting local + make them behave as if --keep-changes were passed, and non-conflicting local changes will be tolerated and preserved. If incompatible options such as -f/--force or --exact are passed, this setting is ignored.