Rev 3389: (abentley) Improve 'uncommit' documentation in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3389
revision-id:pqm at pqm.ubuntu.com-20080429014232-4b86ax5pwynnf11i
parent: pqm at pqm.ubuntu.com-20080428205328-bvr1g467xfx7rz9w
parent: aaron at aaronbentley.com-20080428224739-1n5u92ht05c1hx2d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-04-29 02:42:32 +0100
message:
  (abentley) Improve 'uncommit' documentation
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3.1.20.1.39
    revision-id:aaron at aaronbentley.com-20080428224739-1n5u92ht05c1hx2d
    parent: aaron at aaronbentley.com-20080428012745-n6x7a8cymzkswbtv
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2008-04-28 18:47:39 -0400
    message:
      Update 'uncommit' docs
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-04-28 03:52:09 +0000
+++ b/bzrlib/builtins.py	2008-04-29 01:42:32 +0000
@@ -3665,8 +3665,9 @@
     specified revision.  For example, "bzr uncommit -r 15" will leave the
     branch at revision 15.
 
-    In the future, uncommit will create a revision bundle, which can then
-    be re-applied.
+    Uncommit leaves the working tree ready for a new commit.  The only change
+    it may make is to restore any pending merges that were present before
+    the commit.
     """
 
     # TODO: jam 20060108 Add an option to allow uncommit to remove