Mercurial > emacs

changeset 112271:8f641c1fc9cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bzrmerge.el trivia. * admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator. (bzrmerge-resolve): Also ignore cl-loaddefs.el.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 Jan 2011 12:42:23 -0800
parents cc0887b67703
children 108035eb74dc
files admin/ChangeLog admin/bzrmerge.el
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/admin/ChangeLog	Sat Jan 15 12:38:27 2011 -0800
+++ b/admin/ChangeLog	Sat Jan 15 12:42:23 2011 -0800
@@ -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.
--- a/admin/bzrmerge.el	Sat Jan 15 12:38:27 2011 -0800
+++ b/admin/bzrmerge.el	Sat Jan 15 12:42:23 2011 -0800
@@ -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