martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Glenn Morris
2011-02-12 15:37:43 -08:00
parent cdfa139da4
commit 7b24e97ab5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/ChangeLog
View File

@@ -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.

4
admin/bzrmerge.el
View File

@@ -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))