Merge from mainline.

4 files changed, 34 insertions, 3 deletions

diff --git a/admin/notes/bzr b/admin/notes/bzr
index c66cdd98a3c..7a668b13f1c 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -38,3 +38,37 @@ 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
+
+* 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 command
+again if there are more revisions still to merge.
+You can commit either before you do this (eg if you had a lot of
+conflicts to resolve and don't want to get confused), or refrain from
+committing until bzrmerge has merged all revisions.
+
+Before committing, check bzr status and bzr diff output.
+
+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.
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/multi-tty b/admin/notes/multi-tty
index 1dfc56f7a10..aa0fdc772f6 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -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