Merge lp:~nmb/bzr/fix-358821 into lp:bzr

[Neil Martinsen-Burrell]

[Neil Martinsen-Burrell (nmb)]

This clarifies (hopefully) when revert will delete files and when it will make backups.

[Martin Pool (mbp)]

That looks good except that 'the' should be 'they'.

review: Approve

[Ian Clatworthy (ian-clatworthy)]

I'll merge.

review: Approve

[Robert Collins (lifeless)]

Neil, I don't have you on file as having signed the contributor agreement. This is covered at http://www.canonical.com/contributors. Please CC me and Martin on the mail, and I'll land your merges once received.

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-11-23 00:57:38 +0000
+++ bzrlib/builtins.py	2009-11-23 15:50:31 +0000
@@ -4065,9 +4065,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, the 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