diff mercurial/commands.py @ 15747:e251250ac20b

merge with stable

--- a/mercurial/commands.py	Tue Dec 27 00:11:22 2011 +0100
+++ b/mercurial/commands.py	Thu Dec 29 14:45:18 2011 -0600
@@ -4902,11 +4902,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