[Emacs-diffs] /srv/bzr/emacs/trunk r103397: * admin/notes/bzr: More details about merging ChangeLogs.

[Glenn Morris]

------------------------------------------------------------
revno: 103397
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-22 20:24:13 -0800
message:
  * admin/notes/bzr: More details about merging ChangeLogs.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-02-23 03:50:04 +0000
+++ b/admin/notes/bzr   2011-02-23 04:24:13 +0000
@@ -117,7 +117,10 @@
 bzrmerge tries to fix up the dates to today's date, but it only does
 this where there are conflicts.  If you used the changelog_merge plugin,
 there won't be any conflicts, and (at time of writing) you will need
-to adjust dates by hand.
+to adjust dates by hand.  In any case, if someone made multiple
+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).
 
 Notes: