Rev 2914: Better help for revert in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2914
revision-id: pqm at pqm.ubuntu.com-20071017083250-zstfljmmitbo4e1j
parent: pqm at pqm.ubuntu.com-20071017055911-jots6fwy20740n0i
parent: mbp at sourcefrog.net-20071017075247-1wwd680kq8bsr11t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-17 09:32:50 +0100
message:
  Better help for revert
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2911.2.1
    merged: mbp at sourcefrog.net-20071017075247-1wwd680kq8bsr11t
    parent: pqm at pqm.ubuntu.com-20071016112750-1q8brfaq6metpfn8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Wed 2007-10-17 17:52:47 +1000
    message:
      Better help for revert
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-10-12 02:07:59 +0000
+++ b/bzrlib/builtins.py	2007-10-17 07:52:47 +0000
@@ -3055,6 +3055,14 @@
     Any files that have been newly added since that revision will be deleted,
     with a backup kept if appropriate.  Directories containing unknown files
     will not be deleted.
+
+    The working tree contains a list of pending merged revisions, which will
+    be included as parents in the next commit.  Normally, revert clears that
+    list as well as reverting the files.  If any files, are specified, revert
+    leaves the pending merge list alnone and reverts only the files.  Use "bzr
+    revert ." in the tree root to revert all files but keep the merge record,
+    and "bzr revert --forget-merges" to clear the pending merge list without
+    reverting any files.
     """
 
     _see_also = ['cat', 'export']