Merge from mainline.

3 files changed, 47 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ce7ff76aa2c..335fe1df921 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,9 +1,13 @@
-2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove no-longer needed getloadavg symbols.
         * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
         (LDAV_SYMBOL): Remove.
 
+2011-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
+
 2011-02-05  Glenn Morris  <rgm@gnu.org>
 
         * bzrmerge.el (bzrmerge-warning-buffer): New constant.
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 061af80b6cf..77e64a862c8 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -187,7 +187,9 @@ are both lists of revnos, in oldest-first order."
           (cond
            ((member file '("configure" "lisp/ldefs-boot.el"
                            "lisp/emacs-lisp/cl-loaddefs.el"))
-            (call-process "bzr" nil t nil "revert" file)
+            ;; We are in the file's buffer, so names are relative.
+            (call-process "bzr" nil t nil "revert"
+                          (file-name-nondirectory file))
             (revert-buffer nil 'noconfirm))
            (t
             (goto-char (point-max))
diff --git a/admin/notes/bzr b/admin/notes/bzr
index cb2a1bd4e4f..11f0af17a3b 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -65,11 +65,26 @@ removes a file, then remove the corresponding files by hand.
 The following description uses bound branches, presumably it works in
 a similar way with unbound ones.
 
+0) (First time only) Get the bzr changelog_merge plugin:
+
+cd ~/.bazaar/plugins
+bzr branch lp:bzr-changelog-merge
+mv bzr-changelog-merge changelog_merge
+
+This will make merging ChangeLogs a lot smoother.  It merges new
+entries to the top of the file, rather than trying to fit them in
+mid-way through.
+
 1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
 Check for any uncommitted changes with bzr status.
 
 2) M-x cd /path/to/trunk
 
+The first time only, do this:
+cd .bzr/branch
+Add the following line to branch.conf:
+changelog_merge_files = ChangeLog
+
 3) load admin/bzrmerge.el
 
 4) M-x bzrmerge RET /path/to/emacs-23 RET
@@ -119,3 +134,27 @@ right thing to do is merge everything else, resolve the conflict by
 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.