Mercurial > hg
changeset 14026:4f19242dac6c
strip: make it clear that --force discards changes (issue310)
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 29 Apr 2011 14:56:23 +0200 |
| parents | 92b768e9f80c |
| children | 78ab705a8147 |
| files | hgext/mq.py |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Fri Apr 29 11:10:11 2011 +0200 +++ b/hgext/mq.py Fri Apr 29 14:56:23 2011 +0200 @@ -2555,8 +2555,9 @@ """strip changesets and all their descendants from the repository The strip command removes the specified changesets and all their - descendants. If the working directory has uncommitted changes, - the operation is aborted unless the --force flag is supplied. + descendants. If the working directory has uncommitted changes, the + operation is aborted unless the --force flag is supplied, in which + case changes will be discarded. If a parent of the working directory is stripped, then the working directory will automatically be updated to the most recent @@ -3252,8 +3253,8 @@ _('hg qseries [-ms]')), "strip": (strip, - [('f', 'force', None, _('force removal of changesets even if the ' - 'working directory has uncommitted changes')), + [('f', 'force', None, _('force removal of changesets, discard ' + 'uncommitted changes (no backup)')), ('b', 'backup', None, _('bundle only changesets with local revision' ' number greater than REV which are not' ' descendants of REV (DEPRECATED)')),