procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bzrmerge.el trivia.

Browse source 
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
This commit is contained in:
Glenn Morris 2011-01-15 12:42:23 -08:00
parent d52969e8af
commit 6fffc9003c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
admin/ChangeLog
View file

@ -1,3 +1,8 @@
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.

5
admin/bzrmerge.el
View file

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