# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1304081783 -7200
# Node ID 4f19242dac6ce71c111850bb27b9df322414d6a2
# Parent  92b768e9f80cab81632b12295417a44431db8c19
strip: make it clear that --force discards changes (issue310)

diff -r 92b768e9f80c -r 4f19242dac6c hgext/mq.py
--- 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)')),