bzrmerge.el trivia.

* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5807863a9105d01110d5e65087fa19bc3fbee0fd..0fdd0967892d3fb30a58dd1b3c82a5c33b23fb2f 100644 (file)
--- 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 ca10d2a87a29a7c6c43e027f0333d747f3caa3b7..6764cbf853a3fd112202b49cd4c8e1832302dbe4 100644 (file)
--- 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