Mercurial > hg-stable

changeset 14502:deb82fdda94e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 78fe305f5965
children 4e958f2a193f
files hgext/mq.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Tue Apr 26 10:51:19 2011 -0500
+++ b/hgext/mq.py	Fri Apr 29 14:56:23 2011 +0200
@@ -2537,8 +2537,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
@@ -3234,8 +3235,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)')),