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

[bpt/emacs.git] / admin / bzrmerge.el

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 061af80..77e64a8 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))