diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-15 12:42:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-15 12:42:23 -0800 |
| commit | 6fffc9003cf1a2677f04f6bc53ee96029816b3a9 (patch) | |
| tree | 2025da26937271e5fe559518beff9597d712b904 /admin | |
| parent | d52969e8afaa19ed1acc01f4ff0bb651bf7869a7 (diff) | |
| download | emacs-6fffc9003cf1a2677f04f6bc53ee96029816b3a9.tar.gz | |
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/bzrmerge.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 5807863a910..0fdd0967892 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -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. diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index ca10d2a87a2..6764cbf853a 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -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 |