[MERGE][Bug #106726] "bzr uncommit --help" doesn't explain "-r" option adequately

[Daniel Watkins]

Attached is a bundle which modifies 'bzr uncommit --help' as suggested
in the bug comments[0].

[Footnote 0: https://bugs.launchpad.net/bzr/+bug/106726/comments/1]

-- 
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070825125617-\
#   cnmg8aeik7ish63b
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: bd27b8f7ab9842135d6c17b0fc662e2361e3617e
# timestamp: 2007-08-25 14:56:28 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-24 13:02:26 +0000
+++ NEWS	2007-08-25 12:56:17 +0000
@@ -36,6 +36,9 @@
     * patch verification for merge directives is reactivated, and works with
       CRLF and CR files.  (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'
--- bzrlib/builtins.py	2007-08-21 01:32:29 +0000
+++ 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.
     """

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbj3X1cAAyDfgFAQWff//1cj
CID/7//wUAYe4ZmlAFjFJABUJJJqm1HqfqYJkyNU/VP1T9U8J6o2SbUaeiMEBzAJpgEyGAAJgmAA
ACUTEmo1PU9GhI/VPIPU0DUGQ9QbTTSMHMAmmATIYAAmCYAAAJIiZNAJpk0JpqepplHqPQm1BkAG
kEX2aacDPvLBj6f8cfgetO6NfqfOwXQGFEYvrji0SERLba63OaqcllK5ER0LjSbfMunTgMuYvD9G
QUVVVPLxCblDhEOdakZXk10lfOr8d5rxm4yZmOP/jmjfnOcfexTiw4PUL278ViPfXI0qCtqYJsxK
HBp2tr1X2d5pLMHjdZOFjs7Olmwg/CCO+BqHQMFQFJDGu3fEp9mV12fRGpah56eoTJKHKwuFpO8f
Qg7CVWLotl3R9EkNnM/ZOgOne73ViStVawQDJKkNVEja3O/zEctZgtB0/iRGQKRzuOZVwvKIsG8J
ciKPjWVlgRBE35gig5cRJsESMih/rHX8NwXT3WulajVi7TWUoX5bCrYYgCvRdTMbozqkswKMZR6F
mDXYi1vCo95aEDEyQdcCh8lbPeeKBZxpvzjl6F1nEYyKB9WSW9JWlxit6vyiyu3EGrS3jlhoILCR
UfSPg8oyGNhaFIxDE0iAtIzujmNKFXqyIVNigbE4WC6lg72wmVhXVeFixQXhIxoRe8uqHxLixwwY
rHMkGEqNUcgaxWK5QMnPUiXpL9sQmXRQV0IFFkZHQmKVRmQMsFyIHA1MCC7JlXg/hq6vmaO4sTXX
HoFXoLO3g2FhE0DebFCpGRI2InA3zGwN5UVGmGjVOJsARjoXhwMiqiJVELcC0sGYgqxSIHsFQvaw
vdBVYXETiTQXgi8iOZ0kOQMdqiRExHmd4tC8pTMoXXYkOETQkOQtQcMTMNTOedquvdzImhxQUgqS
q+Idj8wrGBeAwdTYkFzjHtHyg6dfYwyp8TcHMbBiZIJkmGJPsRWQBuJVFQVN+08qD/ZbPCsqzTN7
rrUZ5xmcrpE5JifJ5SMfq2R2OUYDi4Y1kCIvLi87sshtCAgYz7oFA0gqkfNLtO+0IrD/ODmocWSG
5IDKUYPAxQ9JTndxRMyvLD3nQ4neDqB5dORPp2JeelYzfa2i/RA56Ae21AeA7jHibiGGZEyLdewN
xK3SBvyFQKkbjZBNGZuBuAw6bOPqby4sR5EhOZGKDeVlPkUXYLDJG8bl+CJXF5dwdUTDzNa7M8rI
jQOO0rN4Shboy+8vIpWlDdE3nhxNzNbnd9xuNhTVqxPSWBsJxHktZEsgKBolMEdlIW8iY8/93kPI
1OZEzHG0YwIw1YFCXMxKVBYORx3HY+AqhbUGAKxextVAXiZgLhQl0lAn/CTO6Y4ID+oLVEowxDBm
6CqFPVSDD6JYbOajVJkB8+ZImayGSDOHQXiCIJYVGu5YoBhA3eLVK0EddFOsXuJjMdmMSsuXLWq8
tXeXEVA9wfVfBJMqIoF3vOJQOoqvZslak6CB2BtMK5CRaFQbkRSiMVkVxE0iIVMhE07CdhE04t+h
7EH750tSJpQYS8xnENEig+taWdiHyYWETY89Eh7Pq2xsbCkHQsA8SGGHC1fKhaWgxYuirE6Dkdzs
d3KJBMRA6h2JJG+0m/uGLhhRGpOyxHGx43ASCDBFAOLidzJRJgw6AfZE90hMFAcEMVC9bqJSAkrR
mbzOZALuYXjEC0sCQwsOoOEFiSBFCLUS5OkTYVwy9qDviFygcllrByA03nr4zDsymw6xHBUk4tQI
0mMaAmSVKAv1QT/Hg4GJIwH2ZcXGeJzVRIgRL8qKoicP+LuSKcKEhce6+rg=
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070825/3233d7cc/attachment.pgp