[Emacs-diffs] /srv/bzr/emacs/trunk r103269: * admin/notes/bzr: Add section on undoing a bzr remove.

[Glenn Morris]

------------------------------------------------------------
revno: 103269
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-13 18:52:02 -0800
message:
  * admin/notes/bzr: Add section on undoing a bzr remove.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-02-12 23:43:42 +0000
+++ b/admin/notes/bzr   2011-02-14 02:52:02 +0000
@@ -134,3 +134,27 @@
 choosing either the trunk or branch version, then run `make -C lisp
 autoloads' to update the md5sums to the correct trunk value before
 committing.
+
+* Re-adding a file that has been removed from the repository
+
+It's easy to get this wrong. Let's suppose you've done:
+
+bzr remove file; bzr commit
+
+and now, sometime later, you realize this was a mistake and file needs
+to be brought back.  DON'T just do:
+
+bzr add file; bzr commit
+
+This restores file, but without its history (`bzr log file' will be
+very short).  This is because file gets re-added with a new file-id
+(use `bzr file-id file' to see the id).
+
+Insteading of adding the file, try:
+
+bzr revert -rN file; bzr commit
+
+where revision N+1 is the one where file was removed.
+
+You could also try `bzr add --file-ids-from', if you have a copy of
+another branch where file still exists.