Mercurial > hg
comparison tests/test-merge4.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 | 63c817ea4a70 |
children | 8561ad49915d |
comparison
equal
deleted
inserted
replaced
16732:277e2acb7e5c | 16733:4da10c00a20c |
---|