From d0ba09dcd877f4e8b6b7643c69d596ac88b545bc Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 12 Feb 2011 15:43:42 -0800 Subject: [PATCH] * admin/notes/bzr: Mention the helpful changelog_merge plugin. --- admin/notes/bzr | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/admin/notes/bzr b/admin/notes/bzr index cb2a1bd4e4f..07a3c6dd09f 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -65,11 +65,26 @@ removes a file, then remove the corresponding files by hand. The following description uses bound branches, presumably it works in a similar way with unbound ones. +0) (First time only) Get the bzr changelog_merge plugin: + +cd ~/.bazaar/plugins +bzr branch lp:bzr-changelog-merge +mv bzr-changelog-merge changelog_merge + +This will make merging ChangeLogs a lot smoother. It merges new +entries to the top of the file, rather than trying to fit them in +mid-way through. + 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 +The first time only, do this: +cd .bzr/branch +Add the following line to branch.conf: +changelog_merge_files = ChangeLog + 3) load admin/bzrmerge.el 4) M-x bzrmerge RET /path/to/emacs-23 RET -- 2.39.5