Bazaar

Merge lp:~jbowtie/bzr/doc-bzr-update-191466 into lp:bzr

  1. doc-bzr-update-191466
  2. Merge into bzr.dev
Proposed by John C Barstow
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 5434
Proposed branch: lp:~jbowtie/bzr/doc-bzr-update-191466
Merge into: lp:bzr
Diff against target: 13 lines (+3/-0)
1 file modified
bzrlib/builtins.py (+3/-0)
To merge this branch: bzr merge lp:~jbowtie/bzr/doc-bzr-update-191466
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+35793@code.launchpad.net

Description of the change

Fix #191466 by documenting fact that 'bzr revert' should be used to
restore locally deleted files.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

I wonder if it could be combined with the previous paragraph which also mentions 'bzr revert'. Otherwise:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/builtins.py'
2--- bzrlib/builtins.py 2010-09-15 10:40:51 +0000
3+++ bzrlib/builtins.py 2010-09-17 10:07:49 +0000
4@@ -1354,6 +1354,9 @@
5 If you want to discard your local changes, you can just do a
6 'bzr revert' instead of 'bzr commit' after the update.
7
8+ If you want to restore a file that has been removed locally, use
9+ 'bzr revert' instead of 'bzr update'.
10+
11 If the tree's branch is bound to a master branch, it will also update
12 the branch from the master.
13 """