Rev 2759: (Daniel Watkins) Better explanation of -r in uncommit help in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2759
revision-id: pqm at pqm.ubuntu.com-20070828082340-2byilw23kzl3cjx4
parent: pqm at pqm.ubuntu.com-20070828075200-y6ww43ym8xt0fv21
parent: ian.clatworthy at internode.on.net-20070828072755-apth2gniq7abfilg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-28 09:23:40 +0100
message:
  (Daniel Watkins) Better explanation of -r in uncommit help
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2757.1.1
    merged: ian.clatworthy at internode.on.net-20070828072755-apth2gniq7abfilg
    parent: pqm at pqm.ubuntu.com-20070828072028-0fvw3cajmigl3h2j
    parent: d.m.watkins at warwick.ac.uk-20070825125617-cnmg8aeik7ish63b
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: ianc-integration
    timestamp: Tue 2007-08-28 17:27:55 +1000
    message:
      (Daniel Watkins) Better explanation of -r in uncommit help
    ------------------------------------------------------------
    revno: 2747.2.2
    merged: d.m.watkins at warwick.ac.uk-20070825125617-cnmg8aeik7ish63b
    parent: d.m.watkins at warwick.ac.uk-20070825125438-mp4g981coqtuwoby
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: 106726
    timestamp: Sat 2007-08-25 14:56:17 +0200
    message:
      'uncommit --help' now explains the -r option adequately, fixing bug #106726.
    ------------------------------------------------------------
    revno: 2747.2.1
    merged: d.m.watkins at warwick.ac.uk-20070825125438-mp4g981coqtuwoby
    parent: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: 106726
    timestamp: Sat 2007-08-25 14:54:38 +0200
    message:
      Modified the help message of 'uncommit'.
=== modified file 'NEWS'
--- a/NEWS	2007-08-28 07:52:00 +0000
+++ b/NEWS	2007-08-28 08:23:40 +0000
@@ -46,6 +46,9 @@
 
     * man page no longer lists hidden options (#131667, Aaron Bentley)
 
+    * ``uncommit --help`` now explains the -r option adequately.  (Daniel
+      Watkins, #106726)
+
   IMPROVEMENTS:
 
     * ``pull`` and ``merge`` are much faster at installing bundle format 4.

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-08-21 01:32:29 +0000
+++ b/bzrlib/builtins.py	2007-08-25 12:54:38 +0000
@@ -3419,7 +3419,11 @@
     --verbose will print out what is being removed.
     --dry-run will go through all the motions, but not actually
     remove anything.
-    
+
+    If --revision is specified, uncommit revisions to leave the branch at the
+    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.
     """