Merge from mainline.

2 files changed, 18 insertions, 4 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 02ca77bf7de..f2805eae443 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -489,7 +489,7 @@ Here "{id}" is a literal string, a placeholder that will be replaced
 by the bug number you specify after `--fixes debbugs:' in the bzr
 command line (123 in the example above).
 
-In the bazaar.conf file, this setting should go into the [DEFAULTS]
+In the bazaar.conf file, this setting should go into the [DEFAULT]
 section.
 
 In the locations.conf file, it should go into the branch-specific
diff --git a/admin/notes/bzr b/admin/notes/bzr
index 11f0af17a3b..14a5c92a454 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -75,6 +75,12 @@ 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.
 
+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.
 
@@ -112,9 +118,17 @@ and is due to a technical limitation of bzr.  The log data for those
 revisions gets merged, the actual changes themselves do not.
 http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html )
 
-Note that ChangeLog entries are automatically merged to the top with
-today's date, but you still might want to check them to see that too
-much is not being included, or whitespace between entries is not missing.
+In particular, check the ChangeLog entries (eg in case too many
+entries have been included or whitespace between entries needs fixing).
+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.  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).
+Obviously, if there are multiple changes to the same file by different
+authors, don't break the logical ordering in doing this.
 
 Notes: