[Emacs-diffs] /srv/bzr/emacs/trunk r103409: * admin/notes/bzr: Small updates.

[Glenn Morris]

------------------------------------------------------------
revno: 103409
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-23 19:56:36 -0800
message:
  * admin/notes/bzr: Small updates.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-02-23 04:24:13 +0000
+++ b/admin/notes/bzr   2011-02-24 03:56:36 +0000
@@ -75,6 +75,12 @@
 entries to the top of the file, rather than trying to fit them in
 mid-way through.
 
+Sigh.  This plugin has a drawback.  People often like to edit older
+ChangeLog entries, not at the head of the file.  Frequently they do
+this in the same commit as making new entries.  Using this plugin
+will merge ALL changed entries (including older ones) to the top of
+the destination file.
+
 1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
 Check for any uncommitted changes with bzr status.
 
@@ -121,6 +127,8 @@
 ChangeLog entries on different days in the branch, you may wish to
 collapse them all to a single entry for that author in the trunk
 (because in the trunk they all appear under the same date).
+Obviously, if there are multiple changes to the same file by different
+authors, don't break the logical ordering in doing this.
 
 Notes: