# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1325188938 21600
# Node ID 5a20115e73977c5a6d78ebb39d63de52e6c74870
# Parent  6266b1b970a5a167388401ae8cdeef206a1880e7
rollback: clarify --force text (issue3175)

diff -r 6266b1b970a5 -r 5a20115e7397 mercurial/commands.py
--- a/mercurial/commands.py	Wed Dec 28 00:01:48 2011 +0100
+++ b/mercurial/commands.py	Thu Dec 29 14:02:18 2011 -0600
@@ -4863,11 +4863,9 @@
     - push (with this repository as the destination)
     - unbundle
 
-    It's possible to lose data with rollback: commit, update back to
-    an older changeset, and then rollback. The update removes the
-    changes you committed from the working directory, and rollback
-    removes them from history. To avoid data loss, you must pass
-    --force in this case.
+    To avoid permanent data loss, rollback will refuse to rollback a
+    commit transaction if it isn't checked out. Use --force to
+    override this protection.
 
     This command is not intended for use on public repositories. Once
     changes are visible for pull by other users, rolling a transaction