* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0ca88ee84d58a6a5ede74a2fea64ae5690b437a0..5f4dd11ec0f31e54b4aed09f480c50e42c4d0a7c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+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 061af80b6cff6bb5263a1312de3cfc2f54243145..77e64a862c8e42f1632e105b08ca60c3e3762e0e 100644 (file)
--- 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))