[Emacs-diffs] /srv/bzr/emacs/trunk r103243: * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.

[Glenn Morris]

------------------------------------------------------------
revno: 103243
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-12 15:37:43 -0800
message:
  * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-02-05 22:46:34 +0000
+++ b/admin/ChangeLog   2011-02-12 23:37:43 +0000
@@ -1,3 +1,7 @@
+2011-02-12  Glenn Morris  <address@hidden>
+
+       * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
+
 2011-02-05  Glenn Morris  <address@hidden>
 
        * bzrmerge.el (bzrmerge-warning-buffer): New constant.

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-02-05 22:46:34 +0000
+++ b/admin/bzrmerge.el 2011-02-12 23:37:43 +0000
@@ -187,7 +187,9 @@
           (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))