[Emacs-diffs] /srv/bzr/emacs/trunk r103244: * admin/notes/bzr: Mention the helpful changelog_merge plugin.

[Glenn Morris]

------------------------------------------------------------
revno: 103244
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-12 15:43:42 -0800
message:
  * admin/notes/bzr: Mention the helpful changelog_merge plugin.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-01-22 19:44:38 +0000
+++ b/admin/notes/bzr   2011-02-12 23:43:42 +0000
@@ -65,11 +65,26 @@
 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