diff options
| author | Joakim Verona | 2012-04-26 11:52:04 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-04-26 11:52:04 +0200 |
| commit | ab5b626f97ea7d71a98a06d8cc777fa925a1f716 (patch) | |
| tree | 7961d0e6b583290e1480771cd0fabd00f4ea7f86 /admin | |
| parent | 2ec5843f029c7d55234dbe51d993003b2b3939ec (diff) | |
| parent | ab036cd7bdd7b087047d241ffb5607d14942179e (diff) | |
| download | emacs-ab5b626f97ea7d71a98a06d8cc777fa925a1f716.tar.gz emacs-ab5b626f97ea7d71a98a06d8cc777fa925a1f716.zip | |
upstream partial out of memory
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 2 | ||||
| -rw-r--r-- | admin/bzrmerge.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 1cc52bc5fb5..a3a756bde64 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> | 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". | ||
| 4 | |||
| 3 | * unidata/Makefile.in: Add FSF copyright. | 5 | * unidata/Makefile.in: Add FSF copyright. |
| 4 | Make it use autoconf features, and work for out-of-tree builds. | 6 | Make it use autoconf features, and work for out-of-tree builds. |
| 5 | 7 | ||
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index cb63d5b16ba..0c72c8b5c93 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | ;;; bzrmerge.el --- help merge one Emacs bzr branch to another | 1 | ;;; bzrmerge.el --- help merge one Emacs bzr branch to another |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: | 6 | ;; Keywords: maint |
| 7 | 7 | ||
| 8 | ;; GNU Emacs is free software: you can redistribute it and/or modify | 8 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
| 9 | ;; it under the terms of the GNU General Public License as published by | 9 | ;; it under the terms of the GNU General Public License as published by |
| @@ -28,7 +28,7 @@ | |||
| 28 | (require 'cl)) ; assert | 28 | (require 'cl)) ; assert |
| 29 | 29 | ||
| 30 | (defvar bzrmerge-skip-regexp | 30 | (defvar bzrmerge-skip-regexp |
| 31 | "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" | 31 | "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk" |
| 32 | "Regexp matching logs of revisions that might be skipped. | 32 | "Regexp matching logs of revisions that might be skipped. |
| 33 | `bzrmerge-missing' will ask you if it should skip any matches.") | 33 | `bzrmerge-missing' will ask you if it should skip any matches.") |
| 34 | 34 | ||