[Emacs-diffs] /srv/bzr/emacs/trunk r102855: bzrmerge.el trivia.

[Glenn Morris]

------------------------------------------------------------
revno: 102855
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-15 12:42:23 -0800
message:
  bzrmerge.el trivia.
  * admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
  (bzrmerge-resolve): Also ignore cl-loaddefs.el.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-01-14 17:42:40 +0000
+++ b/admin/ChangeLog   2011-01-15 20:42:23 +0000
@@ -1,3 +1,8 @@
+2011-01-15  Glenn Morris  <address@hidden>
+
+       * bzrmerge.el (bzrmerge-missing): Add another skip indicator.
+       (bzrmerge-resolve): Also ignore cl-loaddefs.el.
+
 2011-01-14  Glenn Morris  <address@hidden>
 
        * admin.el (set-copyright): Also handle \year in refcards/*.tex.

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-01-14 02:44:25 +0000
+++ b/admin/bzrmerge.el 2011-01-15 20:42:23 +0000
@@ -115,7 +115,7 @@
               (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 @@
             ))
           ;; 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