[Emacs-diffs] /srv/bzr/emacs/trunk r107846: * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".

[Glenn Morris]

------------------------------------------------------------
revno: 107846
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 13:27:01 -0400
message:
  * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
  Add header keyword.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-04-10 07:18:02 +0000
+++ b/admin/ChangeLog   2012-04-10 17:27:01 +0000
@@ -1,5 +1,7 @@
 2012-04-10  Glenn Morris  <address@hidden>
 
+       * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
+
        * unidata/Makefile.in: Add FSF copyright.
        Make it use autoconf features, and work for out-of-tree builds.
 

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2012-01-19 06:42:57 +0000
+++ b/admin/bzrmerge.el 2012-04-10 17:27:01 +0000
@@ -1,9 +1,9 @@
 ;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <address@hidden>
-;; Keywords: 
+;; Keywords: maint
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
   (require 'cl))                        ; assert
 
 (defvar bzrmerge-skip-regexp
-  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version"
+  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk"
   "Regexp matching logs of revisions that might be skipped.
 `bzrmerge-missing' will ask you if it should skip any matches.")