[Emacs-diffs] /srv/bzr/emacs/trunk r105629: bzr 2.4.0, including changelog_merge plugin, was released.

[Glenn Morris]

------------------------------------------------------------
revno: 105629
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-01 00:24:27 -0700
message:
  bzr 2.4.0, including changelog_merge plugin, was released.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-05-28 17:46:02 +0000
+++ b/admin/notes/bzr   2011-09-01 07:24:27 +0000
@@ -72,18 +72,20 @@
 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
-(this will be included by default in bzr 2.4 onwards):
+0) (This step is only necessary if using bzr older than 2.4.0.)
+Get the bzr changelog_merge plugin:
 
 cd ~/.bazaar/plugins
-bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk 
-mv trunk changelog_merge
-
-This should make merging ChangeLogs smoother.  It merges new entries
-to the top of the file, rather than trying to fit them in mid-way
-through.  Newer versions of the plugin should also be able to deal
-with changes to *old* ChangeLog entries, that should not be floated to
-the head of the file (see launchpad#723968).
+bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk 
changelog_merge
+
+This plugin should make merging ChangeLogs smoother.  It merges new
+entries to the top of the file, rather than trying to fit them in
+mid-way through.  Newer versions of the plugin should also be able to
+deal with changes to *old* ChangeLog entries, that should not be
+floated to the head of the file (see launchpad#723968).
+
+It is included in bzr from 2.4.0 onwards, so remember to delete the
+copy in ~/.bazaar if you upgrade bzr.
 
 Maybe the default Emacs behavior without this plugin is better,
 though, it's not clear yet.