From 7b24e97ab5015b43dd76ccc2ed6fdd49f03fa64a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 12 Feb 2011 15:37:43 -0800 Subject: [PATCH] * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. --- admin/ChangeLog | 4 ++++ admin/bzrmerge.el | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 0ca88ee84d5..5f4dd11ec0f 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-02-12 Glenn Morris + + * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. + 2011-02-05 Glenn Morris * 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)) -- 2.11.4.GIT