49 files changed, 681 insertions, 143 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index b5f4d555ad4..7febc93bb33 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -62,7 +62,6 @@ SIGTYPE
 SYSTEM_TYPE
 
 ** Machine specific macros, decribed in detail in src/m/template.h
-EXPLICIT_SIGN_EXTEND
 LOAD_AVE_CVT
 LOAD_AVE_TYPE
 VIRT_ADDR_VARIES
@@ -383,4 +382,3 @@ wait
 write
 xfree
 
-# arch-tag: bc80061a-1168-4911-9766-46aaf2640250
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6d114eae003..46dbaa0da26 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,102 @@
+2011-02-03  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-buffer): New constant.
+        (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
+        (bzrmerge-missing): If nothing to do, return nil not (nil).
+        (bzrmerge-apply): Remove odd character from message.
+        (bzrmerge): Give status messages.
+
+2011-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * admin.el (set-version): Remove lib-src/makefile.w32-in.
+        Add nt/config.nt.
+
+2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        src/emacs.c now gets version number from configure.in
+        * admin.el (set-version): Don't update src/emacs.c.
+        * quick-install-emacs (VERSION): Get it from configure.in, not from
+        src/emacs.c.
+
+2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        strftime: import from gnulib
+        * notes/copyright: strftime.c moved from src to lib.
+
+2011-01-25  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-skip-regexp): New variable.
+        (bzrmerge-missing): Use it.
+
+2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-tarball.txt: Suggest 'autoreconf -I m4 --force'
+        rather than doing rm and autoconf by hand.  See
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
+
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/bzr (Installing changes from gnulib): New section.
+        Need for this suggested by Stefan Monnier.
+
+2011-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
+        an inconsistent state.
+
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Update copyright notes to match recent gnulib-related changes.
+        * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
+        arg-nonnull.h, c++defs.h, compile, depcomp, missing,
+        warn-on-use.h, lib/*.[ch], lib/gnulib.mk.  Remove src/mktime.c,
+        lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
+        are subsumed by the lib/*.[ch] rule).  Remove m4/getopt.m4 (now
+        subsumed by m4/*.m4 rule).  config.guess, config.sub, and
+        doc/man/texinfo.tex are now copied in from gnulib.
+
+2011-01-15  Glenn Morris  <rgm@gnu.org>
+
+        * charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag.
+
+        * 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.
+
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el: Require cl when compiling.
+        (bzrmerge-merges): Doc fix.
+
+2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/copyright: There's only one install-sh, not two, so fix a
+        typo claiming that there's two.  Add move-if-change to the list of
+        GPL files imported from gnulib.
+
+2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/copyright: Report status more accurately for non-GPL files.
+        Report copyright status more accurately for mkinstalldirs,
+        configure, m4/getopt.m4, and msdos/sed*.inp.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * nt/README.W32: Update the information about PNG support libraries.
+        (Bug#7716)
+
+2010-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bzrmerge.el: New file to help merge branches while skipping
+        some revisions (e.g. from emacs-23 to trunk).
+
+2010-12-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.
+
 2010-10-12  Glenn Morris  <rgm@gnu.org>
 
         * notes/nextstep: Move here from ../nextstep/DEV-NOTES.
@@ -963,11 +1062,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-        2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -983,5 +1080,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 432e4f5cf9f..1d988a25626 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -216,4 +216,3 @@ src/xrdb.c
 src/xselect.c
 src/xterm.c
 
-;;; arch-tag: 869126d4-4851-41b2-8470-14dd492a3c98
diff --git a/admin/README b/admin/README
index 694f206baaf..4dd1705fe74 100644
--- a/admin/README
+++ b/admin/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -90,4 +89,3 @@ mode: outline
 paragraph-separate: "[  ]*$"
 end:
 
-# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463
diff --git a/admin/admin.el b/admin/admin.el
index 7cd2c02fb58..9f87e9b2590 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,7 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-;;   2010  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -60,9 +59,6 @@ Root must be the root of an Emacs source tree."
   (interactive "DEmacs root directory: \nsVersion number: ")
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (set-version-in-file root "src/emacs.c" version
-                       (rx (and "emacs_version" (0+ (not (in ?\")))
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "README" version
                        (rx (and "version" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
@@ -77,8 +73,9 @@ Root must be the root of an Emacs source tree."
                        (rx (and ".TH EMACS" (1+ not-newline)
                                 "GNU Emacs" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "lib-src/makefile.w32-in" version
-                       (rx (and "VERSION" (0+ space) "=" (0+ space)
+  (set-version-in-file root "nt/config.nt" version
+                       (rx (and bol "#" (0+ blank) "define" (1+ blank)
+                                "VERSION" (1+ blank)
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "nt/makefile.w32-in" version
                        (rx (and "VERSION" (0+ space) "=" (0+ space)
@@ -160,7 +157,6 @@ Root must be the root of an Emacs source tree."
    version (rx (and "Version=" (submatch (1+ (in "0-9.")))))))
 
 ;; Note this makes some assumptions about form of short copyright.
-;; FIXME add the \year in the refcards/*.tex files.
 (defun set-copyright (root copyright)
   "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT.
 Root must be the root of an Emacs source tree."
@@ -174,16 +170,16 @@ Root must be the root of an Emacs source tree."
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
   (set-version-in-file root "src/emacs.c" copyright
                        (rx (and "emacs_copyright" (0+ (not (in ?\")))
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
+                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/ebrowse.c" copyright
                        (rx (and "emacs_copyright" (0+ (not (in ?\")))
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
+                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/etags.c" copyright
                        (rx (and "emacs_copyright" (0+ (not (in ?\")))
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
+                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/rcs2log" copyright
-                       (rx (and "Copyright" (0+ space) ?= (0+ space)
-                                ?\' (submatch (1+ nonl)))))
+                       (rx (and "Copyright" (0+ space) ?= (0+ space)
+                                ?\' (submatch (1+ nonl)))))
   ;; This one is a nuisance, as it needs to be split over two lines.
   (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright)
   ;; nextstep.
@@ -199,7 +195,18 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file
    root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
    copyright (rx (and "Copyright" (0+ space) ?\= (0+ space)
-                      ?\" (submatch (1+ (not (in ?\"))))))))
+                      ?\" (submatch (1+ (not (in ?\")))))))
+  (when (string-match "\\([0-9]\\{4\\}\\)" copyright)
+    (setq copyright (match-string 1 copyright))
+    (dolist (file (directory-files (expand-file-name "etc/refcards" root)
+                                   t "\\.tex\\'"))
+      (unless (string-match "gnus-refcard\\.tex" file)
+        (set-version-in-file
+         root file copyright
+         (concat (if (string-match "ru-refcard\\.tex" file)
+                     "\\\\newcommand{\\\\cyear}\\[0\\]{"
+                   "\\\\def\\\\year{")
+                 "\\([0-9]\\{4\\}\\)}.+%.+copyright year"))))))
 
 (provide 'admin)
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 8ff699382a0..e09ddd62b97 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-     Free Software Foundation, Inc.
+
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -112,5 +112,3 @@ main (int argc, char **argv)
   return 0;
 }
 
-/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
-   (do not change this comment) */
diff --git a/admin/build-configs b/admin/build-configs
index e20024ff666..79ba58aeec0 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,8 +1,7 @@
 #! /usr/bin/perl
 # Build Emacs in several different configurations.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+# Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -97,4 +96,3 @@ foreach $config (@configs)
 # mode: cperl
 # End:
 
-# arch-tag: 20a4452d-610a-4e54-9abc-ffe79f5c0d30
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
new file mode 100644
index 00000000000..350f3795c52
--- /dev/null
+++ b/admin/bzrmerge.el
@@ -0,0 +1,323 @@
+;;; bzrmerge.el --- help merge one Emacs bzr branch to another
+
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords: 
+
+;; 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
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Some usage notes are in admin/notes/bzr.
+
+;;; Code:
+
+(eval-when-compile
+  (require 'cl))                        ; assert
+
+(defvar bzrmerge-skip-regexp
+  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version"
+  "Regexp matching logs of revisions that might be skipped.
+`bzrmerge-missing' will ask you if it should skip any matches.")
+
+(defconst bzrmerge-buffer "*bzrmerge*"
+  "Working buffer for bzrmerge.")
+
+(defun bzrmerge-merges ()
+  "Return the list of already merged (not yet committed) revisions.
+The list returned is sorted by oldest-first."
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
+    (erase-buffer)
+    ;; We generally want to make sure we start with a clean tree, but we also
+    ;; want to allow restarts (i.e. with some part of FROM already merged but
+    ;; not yet committed).
+    (call-process "bzr" nil t nil "status" "-v")
+    (goto-char (point-min))
+    (when (re-search-forward "^conflicts:\n" nil t)
+      (error "You still have unresolved conflicts"))
+    (let ((merges ()))
+      (if (not (re-search-forward "^pending merges:\n" nil t))
+          (when (save-excursion
+                  (goto-char (point-min))
+                  (re-search-forward "^[a-z ]*:\n" nil t))
+            (error "You still have uncommitted changes"))
+        ;; This is really stupid, but it seems there's no easy way to figure
+        ;; out which revisions have been merged already.  The only info I can
+        ;; find is the "pending merges" from "bzr status -v", which is not
+        ;; very machine-friendly.
+        (while (not (eobp))
+          (skip-chars-forward " ")
+          (push (buffer-substring (point) (line-end-position)) merges)
+          (forward-line 1)))
+      merges)))
+
+(defun bzrmerge-check-match (merge)
+  ;; Make sure the MERGES match the revisions on the FROM branch.
+  ;; Stupidly the best form of MERGES I can find is the one from
+  ;; "bzr status -v" which is very machine non-friendly, so I have
+  ;; to do some fuzzy matching.
+  (let ((author
+         (or
+          (save-excursion
+            (if (re-search-forward "^author: *\\([^<]*[^ ]\\) +<.*"
+                                   nil t)
+                (match-string 1)))
+          (save-excursion
+            (if (re-search-forward
+                 "^committer: *\\([^<]*[^< ]\\) +<" nil t)
+                (match-string 1)))))
+        (timestamp
+         (save-excursion
+           (if (re-search-forward
+                "^timestamp:[^0-9]*\\([-0-9]+\\)" nil t)
+               (match-string 1))))
+        (line1
+         (save-excursion
+           (if (re-search-forward "^message:[ \n]*" nil t)
+               (buffer-substring (point) (line-end-position))))))
+    ;; The `merge' may have a truncated line1 with "...", so get
+    ;; rid of any "..." and then look for a prefix match.
+    (when (string-match "\\.+\\'" merge)
+      (setq merge (substring merge 0 (match-beginning 0))))
+    (or (string-prefix-p
+         merge (concat author " " timestamp " " line1))
+        (string-prefix-p
+         merge (concat author " " timestamp " [merge] " line1)))))
+
+(defun bzrmerge-missing (from merges)
+  "Return the list of revisions that need to be merged.
+MERGES is the revisions already merged but not yet committed.
+Asks about skipping revisions with logs matching `bzrmerge-skip-regexp'.
+The result is of the form (TOMERGE . TOSKIP) where TOMERGE and TOSKIP
+are both lists of revnos, in oldest-first order."
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
+    (erase-buffer)
+    (call-process "bzr" nil t nil "missing" "--theirs-only"
+                  (expand-file-name from))
+    (let ((revnos ()) (skipped ()))
+      (pop-to-buffer (current-buffer))
+      (goto-char (point-max))
+      (while (re-search-backward "^------------------------------------------------------------\nrevno: \\([0-9.]+\\).*" nil t)
+        (save-excursion
+          (if merges
+              (while (not (bzrmerge-check-match (pop merges)))
+                (unless merges
+                  (error "Unmatched tip of merged revisions")))
+            (let ((case-fold-search t)
+                  (revno (match-string 1))
+                  (skip nil))
+              (if (string-match "\\." revno)
+                  (error "Unexpected dotted revno!")
+                (setq revno (string-to-number revno)))
+              (re-search-forward "^message:\n")
+              (while (and (not skip)
+                          (re-search-forward bzrmerge-skip-regexp nil t))
+                (let ((str (buffer-substring (line-beginning-position)
+                                             (line-end-position))))
+                  (when (string-match "\\` *" str)
+                    (setq str (substring str (match-end 0))))
+                  (when (string-match "[.!;, ]+\\'" str)
+                    (setq str (substring str 0 (match-beginning 0))))
+                  (if (save-excursion (y-or-n-p (concat str ": Skip? ")))
+                      (setq skip t))))
+              (if skip
+                  (push revno skipped)
+                (push revno revnos)))))
+        (delete-region (point) (point-max)))
+      (and (or revnos skipped)
+           (cons (nreverse revnos) (nreverse skipped))))))
+
+(defun bzrmerge-resolve (file)
+  (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file))
+  (with-demoted-errors
+    (let ((exists (find-buffer-visiting file)))
+      (with-current-buffer (find-file-noselect file)
+        (if (buffer-modified-p)
+            (error "Unsaved changes in %s" (current-buffer)))
+        (save-excursion
+          (cond
+           ((derived-mode-p 'change-log-mode)
+            ;; Fix up dates before resolving the conflicts.
+            (goto-char (point-min))
+            (let ((diff-auto-refine-mode nil))
+              (while (re-search-forward smerge-begin-re nil t)
+                (smerge-match-conflict)
+                (smerge-ensure-match 3)
+                (let ((start1 (match-beginning 1))
+                      (end1 (match-end 1))
+                      (start3 (match-beginning 3))
+                      (end3 (copy-marker (match-end 3) t)))
+                  (goto-char start3)
+                  (while (re-search-forward change-log-start-entry-re end3 t)
+                    (let* ((str (match-string 0))
+                           (newstr (save-match-data
+                                     (concat (add-log-iso8601-time-string)
+                                             (when (string-match " *\\'" str)
+                                               (match-string 0 str))))))
+                      (replace-match newstr t t)))
+                  ;; change-log-resolve-conflict prefers to put match-1's
+                  ;; elements first (for equal dates), whereas we want to put
+                  ;; match-3's first.
+                  (let ((match3 (buffer-substring start3 end3))
+                        (match1 (buffer-substring start1 end1)))
+                    (delete-region start3 end3)
+                    (goto-char start3)
+                    (insert match1)
+                    (delete-region start1 end1)
+                    (goto-char start1)
+                    (insert match3)))))
+            ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve)
+            ))
+          ;; Try to resolve the conflicts.
+          (cond
+           ((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
+            (goto-char (point-max))
+            (while (re-search-backward smerge-begin-re nil t)
+              (save-excursion
+                (ignore-errors
+                  (smerge-match-conflict)
+                  (smerge-resolve))))
+            ;; (when (derived-mode-p 'change-log-mode)
+            ;;   (pop-to-buffer (current-buffer)) (debug 'after-resolve))
+            (save-buffer)))
+          (goto-char (point-min))
+          (prog1 (re-search-forward smerge-begin-re nil t)
+            (unless exists (kill-buffer))))))))
+
+(defun bzrmerge-add-metadata (from endrevno)
+  "Add the metadata for a merge of FROM upto ENDREVNO.
+Does not make other difference."
+  (if (with-temp-buffer
+        (call-process "bzr" nil t nil "status")
+        (goto-char (point-min))
+        (re-search-forward "^conflicts:\n" nil t))
+      (error "Don't know how to add metadata in the presence of conflicts")
+    (call-process "bzr" nil t nil "shelve" "--all"
+                  "-m" "Bzrmerge shelved merge during skipping")
+    (call-process "bzr" nil t nil "revert")
+    (call-process "bzr" nil t nil
+                  "merge" "-r" (format "%s" endrevno) from)
+    (call-process "bzr" nil t nil "revert" ".")
+    (call-process "bzr" nil t nil "unshelve")))
+
+(defvar bzrmerge-already-done nil)
+
+(defun bzrmerge-apply (missing from)
+  (setq from (expand-file-name from))
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
+    (erase-buffer)
+    (when (equal (cdr bzrmerge-already-done) (list from missing))
+      (setq missing (car bzrmerge-already-done)))
+    (setq bzrmerge-already-done nil)
+    (let ((merge (car missing))
+          (skip (cdr missing))
+          (unsafe nil)
+          beg end)
+      (when (or merge skip)
+        (cond
+         ((and skip (or (null merge) (< (car skip) (car merge))))
+          ;; Do a "skip" (i.e. merge the meta-data only).
+          (setq beg (1- (car skip)))
+          (while (and skip (or (null merge) (< (car skip) (car merge))))
+            (assert (> (car skip) (or end beg)))
+            (setq end (pop skip)))
+          (message "Skipping %s..%s" beg end)
+          (bzrmerge-add-metadata from end))
+
+         (t
+          ;; Do a "normal" merge.
+          (assert (or (null skip) (< (car merge) (car skip))))
+          (setq beg (1- (car merge)))
+          (while (and merge (or (null skip) (< (car merge) (car skip))))
+            (assert (> (car merge) (or end beg)))
+            (setq end (pop merge)))
+          (message "Merging %s..%s" beg end)
+          (if (with-temp-buffer
+                (call-process "bzr" nil t nil "status")
+                (zerop (buffer-size)))
+              (call-process "bzr" nil t nil
+                            "merge" "-r" (format "%s" end) from)
+            ;; Stupidly, "bzr merge --force -r A..B" dos not maintain the
+            ;; metadata properly except when the checkout is clean.
+            (call-process "bzr" nil t nil "merge"
+                          "--force" "-r" (format "%s..%s" beg end) from)
+            ;; The merge did not update the metadata, so force the next time
+            ;; around to update it (as a "skip").
+            (setq unsafe t)
+            (push end skip))
+          (pop-to-buffer (current-buffer))
+          (sit-for 1)
+          ;; (debug 'after-merge)
+          ;; Check the conflicts.
+          (let ((conflicted nil)
+                (files ()))
+            (goto-char (point-min))
+            (when (re-search-forward "bzr: ERROR:" nil t)
+              (error "Internal Bazaar error!!"))
+            (while (re-search-forward "^Text conflict in " nil t)
+              (push (buffer-substring (point) (line-end-position)) files))
+            (if (re-search-forward "^\\([0-9]+\\) conflicts encountered" nil t)
+                (if (/= (length files) (string-to-number (match-string 1)))
+                    (setq conflicted t))
+              (if files (setq conflicted t)))
+            (dolist (file files)
+              (if (bzrmerge-resolve file)
+                  (setq conflicted t)))
+            (when conflicted
+              (setq bzrmerge-already-done
+                    (list (cons merge skip) from missing))
+              (if unsafe
+                  ;; FIXME: Obviously, we'd rather make it right rather
+                  ;; than output such a warning.  But I don't know how to add
+                  ;; the metadata to bzr's since the technique used in
+                  ;; bzrmerge-add-metadata does not work when there
+                  ;; are conflicts.
+                  (display-warning 'bzrmerge "Resolve conflicts manually.
+¡BEWARE!  Important metadata is kept in this Emacs session!
+Do not commit without re-running `M-x bzrmerge' first!"))
+              (error "Resolve conflicts manually")))))
+        (cons merge skip)))))
+
+(defun bzrmerge (from)
+  "Merge from branch FROM into `default-directory'."
+  (interactive
+   (list
+    (let ((def
+           (with-temp-buffer
+             (call-process "bzr" nil t nil "info")
+             (goto-char (point-min))
+             (when (re-search-forward "submit branch: *" nil t)
+               (buffer-substring (point) (line-end-position))))))
+      (read-file-name "From branch: " nil nil nil def))))
+  (message "Merging from %s..." from)
+  (require 'vc-bzr)
+  (let ((default-directory (or (vc-bzr-root default-directory)
+                               (error "Not in a Bzr tree"))))
+    ;; First, check the status.
+    (let* ((merges (bzrmerge-merges))
+           ;; OK, we have the status, now check the missing data.
+           (missing (bzrmerge-missing from merges)))
+      (if (not missing)
+          (message "Merging from %s...nothing to merge" from)
+        (while missing
+          (setq missing (bzrmerge-apply missing from)))
+        (message "Merging from %s...done" from)))))
+
+(provide 'bzrmerge)
+;;; bzrmerge.el ends here
diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
index a93b18b63cc..b16e7ccd748 100644
--- a/admin/charsets/Makefile
+++ b/admin/charsets/Makefile
@@ -1,5 +1,5 @@
 # Makefile -- Makefile to generate charset maps in etc/charsets.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 #
@@ -307,4 +307,3 @@ install:
 clean:
         rm -f ${CHARSETS} ${TRANS_TABLE}
 
-# arch-tag: 90b3bf30-1fef-45bf-b30c-665c30c22310
diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk
index a0113a6677c..7482d11a2d1 100644
--- a/admin/charsets/big5.awk
+++ b/admin/charsets/big5.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -70,4 +70,3 @@ function decode_big5(big5) {
 }
 
 
-# arch-tag: 36f08d21-0d24-4b67-852d-a9a51299586d
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk
index f84715e1d8d..b7d1fd19d8e 100644
--- a/admin/charsets/compact.awk
+++ b/admin/charsets/compact.awk
@@ -1,5 +1,5 @@
 # compact.awk -- Make charset map compact.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -120,4 +120,3 @@ END {
     }
 }
 
-# arch-tag: 7e6f57c3-8e62-4af3-8916-ca67bca3a0ce
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index 387f314fe37..39ccc1c7dc1 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -1,5 +1,5 @@
 # cp51932.awk -- Generate a translation table for CP51932.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -52,8 +52,4 @@ END {
   print "             (setcar x (cdr x)) (setcdr x tmp)))";
   print "       map)";
   print "  (define-translation-table 'cp51932-encode map))";
-  print "";
-  print ";; arch-tag: d21c06e5-a548-4dda-8802-c2922ff19da3";
 }
-
-# arch-tag: bbae996b-2d1c-4e85-bb55-ac30146d7504
diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk
index 397f025acee..acba0333371 100644
--- a/admin/charsets/cp932.awk
+++ b/admin/charsets/cp932.awk
@@ -1,5 +1,5 @@
 # cp932.awk -- Add sort keys and append user defined area to CP932-2BYTE.map.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -114,4 +114,3 @@ END {
     }
 }
 
-# arch-tag: 998dc444-759d-43ef-87e3-2ab205011394
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk
index f5876777b01..18c19f5fb55 100644
--- a/admin/charsets/eucjp-ms.awk
+++ b/admin/charsets/eucjp-ms.awk
@@ -1,5 +1,5 @@
 # eucjp-ms.awk -- Generate a translation table for eucJP-ms.
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -106,8 +106,5 @@ END {
   print "             (setcar x (cdr x)) (setcdr x tmp)))";
   print "       map)";
   print "  (define-translation-table 'eucjp-ms-encode map))";
-  print "";
-  print ";; arch-tag: c4191096-288a-4f13-9b2a-ee7a1f11eb4a";
 }
 
-# arch-tag: d9cc7af7-2d6e-48cd-8eed-a6d25226de7c
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index fd8748f50be..6cd9521ce90 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -98,4 +98,3 @@ END {
       index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
 }
 
-# arch-tag: d7dbad89-a512-41a4-8ee0-ba1a4505b8c1
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk
index 43e2b474841..3c16cb556ea 100644
--- a/admin/charsets/gb180304.awk
+++ b/admin/charsets/gb180304.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -120,4 +120,3 @@ END {
     }
 }
 
-# arch-tag: 8e5a22ae-610e-411f-ae17-d6e528b30d71
diff --git a/admin/charsets/kuten.awk b/admin/charsets/kuten.awk
index 9d43f2e0e8f..2bc58c438d0 100644
--- a/admin/charsets/kuten.awk
+++ b/admin/charsets/kuten.awk
@@ -4,4 +4,3 @@
   printf "0x%02X%02X %s\n", ku, ten, $2;
 }
 
-# arch-tag: dade6b45-b4c5-42ab-9d49-d6bf23a710b6
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 89943074939..4f7a8b96f54 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 
@@ -143,4 +143,3 @@ else
     exit 1
 fi
 
-# arch-tag: c33acb47-7eb6-4872-b871-15e1447e8f0e
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index 3e09cfd098f..c1804af98cd 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -1,5 +1,5 @@
-Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-Copyright (C) 2009, 2010
+Copyright (C) 2009-2011 Free Software Foundation, Inc.
+Copyright (C) 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
 See the end of the file for license conditions.
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 07708bcd5a4..59969c3df28 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -1,5 +1,5 @@
 ;; mule-charsets.el -- Generate Mule-orignal charset maps.
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
@@ -54,4 +54,3 @@
     (map-charset-chars 'func (cdr elt))
     (write-file (car elt))))
 
-;;; arch-tag: 515989d7-2e2d-41cc-9163-05ad472fede4
diff --git a/admin/check-doc-strings b/admin/check-doc-strings
index daed2926b20..ef4b203cd79 100755
--- a/admin/check-doc-strings
+++ b/admin/check-doc-strings
@@ -301,4 +301,3 @@ foreach my $fun (sort keys %texi_funtype) {
   }
 }
 
-# arch-tag: e75331f5-5d1b-4393-ad5b-b0f87b5d47b0
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 35d0412cc43..b254fedccc4 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,7 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002-2011  Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
@@ -525,5 +524,4 @@ in the Emacs source directory."
 
 (provide 'cus-test)
 
-;;; arch-tag: a4991a31-548d-48fb-8ba1-1ebbe68eb2e7
 ;;; cus-test.el ends here
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 9858fc00363..59ae1a6f26c 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,7 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+# Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -40,6 +39,3 @@ tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp
 tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp
 diff -u $old_tmp $new_tmp
 rm -f $new_tmp $old_tmp
-
-
-# arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf
diff --git a/admin/emacs-pretesters b/admin/emacs-pretesters
index 2e1ee64b248..3b1270b477c 100644
--- a/admin/emacs-pretesters
+++ b/admin/emacs-pretesters
@@ -215,4 +215,3 @@ Local Variables:
 mode: text
 End:
 
-# arch-tag: caf47b2c-b56b-44f7-a760-b5bfbed15fd3
diff --git a/admin/make-announcement b/admin/make-announcement
index 37ab76c0f05..dcfd55e8375 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -1,7 +1,6 @@
 #! /bin/bash
 
-## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-##   2010  Free Software Foundation, Inc.
+## Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 ## Author: Francesco Potorti` <pot@gnu.org>
 
@@ -86,4 +85,3 @@ make-changelog-diff $oldtag $newtag
 
 echo " announcement created in $outfile" >&2
 
-# arch-tag: 605e00c7-7330-4c45-81e1-2ed53a13c39f
diff --git a/admin/make-changelog-diff b/admin/make-changelog-diff
index 5ab468c8f5d..88461131a3f 100755
--- a/admin/make-changelog-diff
+++ b/admin/make-changelog-diff
@@ -27,4 +27,3 @@ cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
                s/^\n//
                p"
 
-# arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a
diff --git a/admin/make-emacs b/admin/make-emacs
index 1fecaa33a69..b21dcad5f37 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -2,8 +2,7 @@
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+# Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -184,5 +183,3 @@ exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";
 # Local Variables:
 # mode: cperl
 # End:
-
-# arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index f685dd5e50f..6a8072de06c 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -4,7 +4,8 @@ Instructions to create pretest or release tarballs.
 
 For each step, check for possible errors.
 
-1.   cvs -q update -Pd
+1.  `bzr update' (for a bound branch), or `bzr pull'.
+     bzr status # check for locally modified files
 
 2.  Bootstrap to make 100% sure all elc files are up-to-date, and to
     make sure that the later tagged version will bootstrap, should it be
@@ -27,24 +28,23 @@ For each step, check for possible errors.
     refer to a newer release of Emacs.  (This is probably needed only
     when preparing a major Emacs release, or branching for it.)
 
-5.   rm configure; autoconf
+5.   autoreconf -I m4 --force
      make bootstrap
 
-6.  Commit configure, README, doc/emacs/emacs.texi,
-    doc/lispref/elisp.texi, etc/AUTHORS, src/emacs.c, nt/emacs.rc,
-    and lisp/cus-edit.el (if modified).  Copy lisp/loaddefs.el to
-    lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.  For a release,
-    also commit the ChangeLog files in all directories.
+6.  Commit configure, src/config.in, etc/AUTHORS, all the files changed
+    by M-x set-version, and lisp/cus-edit.el (if modified).
+    Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.
+    For a release, also commit the ChangeLog files in all directories.
 
 7.   make-dist --snapshot.  Check the contents of the new tar with
     admin/diff-tar-files against an older tar file.  Some old pretest
-    tarballs are kept under fencepost.gnu.org:~pot/emacs-pretest/, while
-    old emacs tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+    tarballs may be found at <ftp://alpha.gnu.org/gnu/emacs/pretest>;
+    old release tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
 
     If this is the first pretest of a major release, just comparing
     with the previous release may overlook many new files.  You can try
-    something like `find -f | grep -v CVS...etc' in a clean CVS tree,
-    and compare the results against the new tar contents.
+    something like `find . | sort' in a clean bzr tree, and compare the
+    results against the new tar contents.
 
 8.   xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
 
@@ -107,6 +107,3 @@ For each step, check for possible errors.
 13. For a pretest, announce it on emacs-devel and BCC the pretesters.
     For a release, announce it on info-gnu@gnu.org,
     info-gnu-emacs@gnu.org, and emacs-devel.
-
-
-# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 5b3af5e242c..7c6c0ff4272 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -384,6 +384,14 @@ fixed 123 23.0.60
 *** To remove a "fixed" mark:
 notfixed 123 23.0.60
 
+*** To make a bug as present in a particular version:
+found 123 23.2
+NB if there is no specified "fixed" version, or if there is one and it
+is earlier than the found version, this reopens a closed bug.
+
+The leading "23.1;" that M-x report-emacs-bug adds to bug subjects
+automatically sets a found version (if none is explicitly specified).
+
 *** To assign or reassign a bug to a package or list of packages:
 reassign 1234 emacs
 
@@ -466,16 +474,41 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
 ** Bazaar stuff
 
-*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes
-Emacs bug 123.  You will first need to add a line to your bazaar.conf:
+*** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes
+Emacs bug 123.  You will first need to add a line to one of your
+configuration files, ~/.bazaar/bazaar.conf or ~/.bazaar/locations.conf:
+
+bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
+
+Here "{id}" is a literal string, a placeholder that will be replaced
+by the bug number you specify after `--fixes debbugs:' in the bzr
+command line (123 in the example above).
+
+In the bazaar.conf file, this setting should go into the [DEFAULTS]
+section.
+
+In the locations.conf file, it should go into the branch-specific
+configuration section for the branch where you want this to be in
+effect.  For example, if you want this to be in effect for the branch
+located at `/home/projects/emacs/trunk', you need to have this in your
+~/.bazaar/locations.conf file:
+
+[/home/projects/emacs/trunk]
+bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
+
+If you want to use this in all Emacs branches whose common parent is
+`/home/projects/emacs', put the setting in the [/home/projects/emacs]
+section.  See "bzr help configuration" for more information about
+the *.conf files, their location and formats.  See "bzr help bugs" for
+more information about the bugtracker_debbugs_url setting.
 
-bugtracker_emacs_url = http://debbugs.gnu.org/{id}
+See also log-edit-rewrite-fixes in .dir-locals.el.
 
 Note that all this does is add some metadata to the commit, it doesn't
-actually mark the bug as closed in the tracker.  There seems to be no
-way to see this "metadata" with `bzr log', which is rather poor, but
-it will show up as a link in a recent loggerhead installation, or with
-some of the graphical frontends to bzr log.
+actually mark the bug as closed in the tracker.  You can see this
+information with `bzr log', and it will show up as a link in a recent
+loggerhead installation, or with some of the graphical frontends to
+`bzr log'.
 
 ** Gnus-specific voodoo
 
diff --git a/admin/notes/bzr b/admin/notes/bzr
index c66cdd98a3c..cb2a1bd4e4f 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -38,3 +38,84 @@ Or use shelves; or rebase; or do something else.  See the thread for
 yet another fun excursion into the exciting world of version control.
 
 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
+
+* Installing changes from gnulib
+Some of the files in Emacs are copied from gnulib.  To synchronize
+these files from the version of gnulib that you have checked out into
+a sibling directory of your branch, type "make sync-from-gnulib"; this
+will check out the latest version of gnulib if there is no sibling
+directory already.  It is a good idea to run "bzr status" afterwards,
+so that if a gnulib module added a file, you can record the new file
+using "bzr add".  After synchronizing from gnulib, do a "make" in the
+usual way.
+
+To change the set of gnulib modules, change the GNULIB_MODULES
+variable in the top-level Makefile.in, and then run:
+
+  ./config.status
+  make sync-from-gnulib
+  bzr status
+
+The last command will mention files that may need to be added using
+"bzr add".  If you remove a gnulib module, or if a gnulib module
+removes a file, then remove the corresponding files by hand.
+
+* How to merge changes from emacs-23 to trunk
+
+The following description uses bound branches, presumably it works in
+a similar way with unbound ones.
+
+1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
+Check for any uncommitted changes with bzr status.
+
+2) M-x cd /path/to/trunk
+
+3) load admin/bzrmerge.el
+
+4) M-x bzrmerge RET /path/to/emacs-23 RET
+
+It will prompt about revisions that should be skipped, based on the
+regexp in bzrmerge-missing.  If there are more revisions that you know
+need skipping, you'll have to do that by hand.
+
+5) It will stop if there are any conflicts.  Resolve them.
+Using smerge-mode, there are menu items to skip to the next conflict,
+and to take either the trunk, branch, or both copies.
+
+6) After resolving all conflicts, you might need to run the bzmerge
+command again if there are more revisions still to merge.
+
+Do not commit (or exit Emacs) until you have run bzrmerge to completion.
+
+Before committing, check bzr status and bzr diff output.
+If you have run bzrmerge enough times, the "pending merge tip" in bzr
+status should be the last revision from the emacs-23 branch, and
+bzr status -v should show all the revisions you expect to merge.
+
+(Note that it will also show "skipped" revisions.  This is expected,
+and is due to a technical limitation of bzr.  The log data for those
+revisions gets merged, the actual changes themselves do not.
+http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html )
+
+Note that ChangeLog entries are automatically merged to the top with
+today's date, but you still might want to check them to see that too
+much is not being included, or whitespace between entries is not missing.
+
+Notes:
+
+1) A lot that was in tramp.el in emacs-23 has moved to tramp-sh.el in
+the trunk.  If you end up with a conflict in tramp.el, the changes may
+need to go to tramp-sh.el instead.  Remember to update the file name in
+the ChangeLog.
+
+2) If a file is modified in emacs-23, and deleted in the trunk, you
+get a "contents conflict".  Assuming the changes don't need to be in
+the trunk at all, use `bzr resolve path/to/file --take-this' to keep the
+trunk version.  Prior to bzr 2.2.3, this may fail.  You can just
+delete the .OTHER etc files by hand and use bzr resolve path/to/file.
+
+3) Conflicts in autoload md5sums in comments.  Strictly speaking, the
+right thing to do is merge everything else, resolve the conflict by
+choosing either the trunk or branch version, then run `make -C lisp
+autoloads' to update the md5sums to the correct trunk value before
+committing.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index e0389212304..e4077caf77b 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2007-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -132,10 +132,18 @@ Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
 GNUstep/Emacs.base/Resources/Info-gnustep.plist
    `set-copyright' in admin.el will do all the above.
 
-<top-level>/install-sh
-lispintro/install-sh
+aclocal.m4
+configure
+m4/*.m4
+ - copyright FSF, with unlimited permission to copy, distribute and modify
+
+lib/Makefile.in
+ - copyright FSF, with MIT-like license
+
+install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
+mkinstalldirs
 src/m/news-r6.h
   public domain, leave alone.
 
@@ -218,9 +226,6 @@ lib-src/etags.c
   --version output just says "Copyright <year> FSF" is apparently OK
   from a legal point of view.
 
-lib-src/getopt1.c, getopt_int.h
-  - these are from the GNU C library. Leave the copyrights alone.
-
 lisp/cedet/semantic/imenu.el
   - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html
    in which Eric Ludlam established that the remaining contributions
@@ -329,6 +334,9 @@ Leave the copyrights alone. Leave the Eli Zaretskii copyright in
 is_exec.c alone. See the msdos/README file for the legal history of
 these files.
 
+msdos/sed*.inp - These files are copyright FSF and distributed under
+an MIT-like license.
+
 
 oldXMenu/
   Keep the "copyright.h" method used by X11, rather than moving the
@@ -611,20 +619,25 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these
 alone (may import them from Gnulib again). These are:
 
     Gnulib:
+    arg-nonnull.h
+    c++defs.h
+    compile
+    config.guess
+    config.sub
+    depcomp
+    doc/man/texinfo.tex
+    missing
+    move-if-change
+    warn-on-use.h
+    lib/*.[ch]
+    lib/gnulib.mk
     src/getloadavg.c
     src/gmalloc.c
     src/md5.c
     src/md5.h
-    src/mktime.c
-    src/strftime.c
     src/termcap.c
     src/tparam.c
 
-    Others:
-    config.guess
-    config.sub
-    doc/man/texinfo.tex
-
 Note _not_ included in the above are src/regex.{c,h} (rms: "That
 forked version is only in Emacs, so definitely relicense that."), and
 oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so
diff --git a/admin/notes/elpa b/admin/notes/elpa
new file mode 100644
index 00000000000..e28d81e6d6e
--- /dev/null
+++ b/admin/notes/elpa
@@ -0,0 +1,42 @@
+NOTES ON THE EMACS PACKAGE ARCHIVE
+
+Here are instructions on uploading files to the package archive at
+elpa.gnu.org, for Emacs maintainers.  (If you are not a maintainer,
+contact us if you want to submit a package.)
+
+1. You will need login access to elpa.gnu.org.  You will also need to
+   get the FSF sysadmins to allow ssh access through the FSF firewall
+   for your local machine.  Ensure that your uid, USER, is in the
+   `elpa' group on elpa.gnu.org; this gives you write access to the
+   bzr repository from which the packages are managed.
+
+2. Go to your bzr repository on your local machine.  Of, if you don't
+   have one (you should, if you're tracking Emacs bzr), make one:
+
+     cd $DEVHOME
+     bzr init-repo elpa/
+     cd elpa
+
+   Create a branch for elpa:
+
+     bzr branch bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo package-repo
+
+   Bind the branch:
+
+     cd package-repo/
+     echo "public_branch = bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo" >> .bzr/branch/branch.conf
+     bzr bind bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo
+
+   Now you should be able to do `bzr up' and `bzr commit'.
+
+3. Changes in bzr do not immediately propagate to the user-facing tree
+   (i.e., what users see when they do `M-x list-packages').  That tree
+   is created by a (daily) cron job that does "bzr export".  If for
+   some reason you need to refresh the user-facing tree immediately,
+   run /home/elpa/bin/package-update.sh as the "elpa" user.
+
+   The Org mode dailies are not part of the repository.  After the
+   package-update.sh script creates the user-facing tree, it copies
+   the daily tarfile hosted on orgmode.org directly into that tree.
+
+4. FIXME: How to actually upload a package file.
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index d3fb56a2ba4..d51d3ec1c3b 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -1,5 +1,4 @@
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/iftc b/admin/notes/iftc
index e8dcdd3a6d6..983b1486685 100644
--- a/admin/notes/iftc
+++ b/admin/notes/iftc
@@ -24,4 +24,3 @@ it from other casting.  We commit the changes and can now go about modifying
 LOW and HIGH separately.  When HIGH is ready to handle the type change, the
 cast can be removed.
 
-;;; arch-tag: 3309cc41-5d59-421b-b7be-c94b04083bb5
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO
index 2e453444275..c03d0f6fdfb 100644
--- a/admin/notes/lel-TODO
+++ b/admin/notes/lel-TODO
@@ -1,6 +1,6 @@
 Some lisp/emacs-lisp/ Features and Where They Are Documented
 
-Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2007-2011 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index d7f68930204..85babb903b9 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2007-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
@@ -1360,4 +1360,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d
diff --git a/admin/notes/trailing-whitespace b/admin/notes/trailing-whitespace
index e29456b3a2f..8c85b8984d5 100644
--- a/admin/notes/trailing-whitespace
+++ b/admin/notes/trailing-whitespace
@@ -5,4 +5,3 @@ there was a mass-change to remove such from various branches in cvs.  probably
 it's a good idea to avoid adding trailing whitespace in new code/docs and in
 changes.
 
-;;; arch-tag: de441379-c345-4826-a784-352b5413a698
diff --git a/admin/notes/unicode b/admin/notes/unicode
index a9176377dad..ce7d3732f03 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,7 +1,6 @@
                                             -*-mode: text; coding: latin-1;-*-
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Problems, fixmes and other unicode-related issues
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index 4ab34d3234f..8c7d1510a05 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -1,5 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                            Emacs for Windows
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 6b6c592eab1..4310ac13dd5 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -1,5 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                       Precompiled Distributions of
diff --git a/admin/nt/dump.bat b/admin/nt/dump.bat
index c0e95426ccb..97ed396f206 100755
--- a/admin/nt/dump.bat
+++ b/admin/nt/dump.bat
@@ -18,6 +18,3 @@ copy temacs.exe obj\i386
 obj\i386\temacs -batch -l loadup dump

 copy obj\i386\emacs.exe .

 

-goto skipArchTag

-   arch-tag: 0ca3036d-3a1e-47ea-87c6-9c0845253496

-:skipArchTag

diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 24972e655b6..841a895248e 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,8 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-##   2010  Free Software Foundation, Inc.
+## Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -171,8 +170,10 @@ test x"$SRC" = x && { SRC="`get_config_var srcdir`" || exit 4 ; }
 test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
 test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
 
-VERSION=`grep 'char emacs_version' $SRC/src/emacs.c \
-         | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
+VERSION=`
+  sed -n 's/^AC_INIT(emacs,[     ]*\([^  )]*\).*/\1/p' <$SRC/configure.in
+` || exit 4
+test -n "$VERSION" || { echo >&2 "$me: no version in configure.in"; exit 4; }
 
 DST_SHARE="$prefix/share/emacs/$VERSION"
 DST_BIN="$prefix/bin"
diff --git a/admin/unidata/.gitignore b/admin/unidata/.gitignore
index 4f759a363db..3f2d8ca551d 100644
--- a/admin/unidata/.gitignore
+++ b/admin/unidata/.gitignore
@@ -1,4 +1,3 @@
 *.elc
 unidata.txt
 
-# arch-tag: 1b0c916f-3060-47b4-a8c9-cff5c3598adf
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index e7b0fbe4bf9..04f2f1d4380 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile -- Makefile to generate character property tables.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 #
diff --git a/admin/unidata/bidimirror.awk b/admin/unidata/bidimirror.awk
index 7965f36ad0d..fc3e8afaace 100644
--- a/admin/unidata/bidimirror.awk
+++ b/admin/unidata/bidimirror.awk
@@ -1,6 +1,6 @@
 # Generate data for bidi_mirroring_table, see src/bidi.c:bidi_initialize.
 
-# Copyright (C) 2010, Free Software Foundation, Inc.
+# Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/unidata/biditype.awk b/admin/unidata/biditype.awk
index 6e57884a879..bb1aaad1973 100644
--- a/admin/unidata/biditype.awk
+++ b/admin/unidata/biditype.awk
@@ -1,6 +1,6 @@
 # Generate data for filling bidi_type_table, see src/bidi.c:bidi_initialize.
 
-# Copyright (C) 2010, Free Software Foundation, Inc.
+# Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/unidata/copyright.html b/admin/unidata/copyright.html
index 57a6d3945c1..f414ca461f2 100644
--- a/admin/unidata/copyright.html
+++ b/admin/unidata/copyright.html
@@ -340,6 +340,3 @@ PERFORMANCE OF THE DATA FILES OR SOFTWARE.</p>
 
 
 </html>
-
-<!-- arch-tag: 359e3efa-6eb2-4b4e-841c-f002d7924c5e
-     (do not change this comment) -->
diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 58cea29db8b..1f9f276a35c 100644
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -1,5 +1,5 @@
 # makefile.w32-in -- W32 -*- Makefile -*- to generate character property tables.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 #
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 211c6f0a530..9f898668526 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -1,5 +1,5 @@
 ;; unidata-gen.el -- Create files containing character property data.
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
@@ -1241,7 +1241,7 @@ Property value is a character."
                 (byte-compile describer)
                 (setq describer (symbol-function describer)))
               (set-char-table-extra-slot table 3 describer))
-            (insert ";; Copyright (C) 1991-2009, 2010 Unicode, Inc.
+            (insert ";; Copyright (C) 1991-2009 Unicode, Inc.
 ;; This file was generated from the Unicode data file at
 ;; http://www.unicode.org/Public/UNIDATA/UnicodeData.txt.
 ;; See lisp/international/README for the copyright and permission notice.\n"
@@ -1261,5 +1261,4 @@ Property value is a character."
 
 
 
-;; arch-tag: 961c862e-b821-447e-9b8a-bfbab9c2d525
 ;;; unidata-gen.el ends here