Commit 6fffc900 authored by Glenn Morris's avatar Glenn Morris

bzrmerge.el trivia.

* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
parent d52969e8
2011-01-15 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
2011-01-14 Glenn Morris <rgm@gnu.org>
* admin.el (set-copyright): Also handle \year in refcards/*.tex.
......
......@@ -115,7 +115,7 @@ are both lists of revnos, in oldest-first order."
(re-search-forward "^message:\n")
(while (and (not skip)
(re-search-forward
"back[- ]?port\\|merge\\|re-?generate\\|bump version" nil t))
"back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" nil t))
(let ((str (buffer-substring (line-beginning-position)
(line-end-position))))
(when (string-match "\\` *" str)
......@@ -173,7 +173,8 @@ are both lists of revnos, in oldest-first order."
))
;; Try to resolve the conflicts.
(cond
((member file '("configure" "lisp/ldefs-boot.el"))
((member file '("configure" "lisp/ldefs-boot.el"
"lisp/emacs-lisp/cl-loaddefs.el"))
(call-process "bzr" nil t nil "revert" file)
(revert-buffer nil 'noconfirm))
(t
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment