Rev 4826: (robertc) Documentation fixes. (Neil Martinsen-Burrell, bugs 249919, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4826 [merge]
revision-id: pqm at pqm.ubuntu.com-20091125103441-g8yhh49b6b6ksllc
parent: pqm at pqm.ubuntu.com-20091125091819-a6bl1tg0tgs7r6in
parent: robertc at robertcollins.net-20091125094805-koctpicl0srwgbeg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-11-25 10:34:41 +0000
message:
  (robertc) Documentation fixes. (Neil Martinsen-Burrell, bugs 249919,
  	358821, 486892).
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
  doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-11-24 08:15:17 +0000
+++ b/bzrlib/builtins.py	2009-11-25 09:48:05 +0000
@@ -1850,6 +1850,10 @@
 
             bzr diff -r<chosen_parent>..X
 
+        The changes introduced by revision 2 (equivalent to -r1..2)::
+
+            bzr diff -c2
+
         Show just the differences for file NEWS::
 
             bzr diff NEWS
@@ -4065,9 +4069,10 @@
     name.  If you name a directory, all the contents of that directory will be
     reverted.
 
-    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.
+    If you have newly added files since the target revision, they will be
+    removed.  If the files to be removed have been changed, backups will be
+    created as above.  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

=== modified file 'doc/en/user-guide/reviewing_changes.txt'
--- a/doc/en/user-guide/reviewing_changes.txt	2007-11-21 07:39:16 +0000
+++ b/doc/en/user-guide/reviewing_changes.txt	2009-11-23 15:44:35 +0000
@@ -45,6 +45,14 @@
     % bzr diff -r 1000..          # everything since r1000
     % bzr diff -r 1000..1100      # changes from 1000 to 1100
 
+To see the changes introduced by a single revision, you can use the ``-c``
+option to diff.
+
+::
+ 
+    % bzr diff -c 1000            # changes from r1000
+                                  # identical to -r999..1000
+
 The ``--diff-options`` option causes bzr to run the external diff program,
 passing options.  For example::
 

=== modified file 'doc/en/user-guide/undoing_mistakes.txt'
--- a/doc/en/user-guide/undoing_mistakes.txt	2009-09-09 15:06:00 +0000
+++ b/doc/en/user-guide/undoing_mistakes.txt	2009-11-23 15:29:24 +0000
@@ -134,7 +134,7 @@
 which is probably only what you want if you haven't made any new commits
 since then. If you have, the ``revert`` would wipe them out as well. In that
 case, you probably want to use `Reverse cherrypicking
-<advanced_merging.html#reverse-cherrypicking>`_ instead to
+<adv_merging.html#reverse-cherrypicking>`_ instead to
 back out the bad fix.
 
 Note: As an alternative to using an absolute revision number (like 19), you can