# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1182593100 -7200
# Node ID 8c3d449ecc63090d18d3f7d8cc1afbfe0cefa13c
# Parent  51ec5e06950509440b2b146bd56ff58af37d139b# Parent  dc5920ea12f8637881a3eb2080f36633ae4c6875
Merge with main

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2398,7 +2398,9 @@ def rollback(ui, repo):
       unbundle
 
     This command should be used with care. There is only one level of
-    rollback, and there is no way to undo a rollback.
+    rollback, and there is no way to undo a rollback. It will also
+    restore the dirstate at the time of the last transaction, which
+    may lose subsequent dirstate changes.
 
     This command is not intended for use on public repositories. Once
     changes are visible for pull by other users, rolling a transaction