Add comments about fixing dates in merged ChangeLogs.

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 77e64a862c8e42f1632e105b08ca60c3e3762e0e..33cbae22a6cfe5215e3afd5056018519af313fd1 100644 (file)
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -270,6 +270,9 @@ Does not make other difference."
           (sit-for 1)
           ;; (debug 'after-merge)
           ;; Check the conflicts.
+          ;; FIXME if using the helpful bzr changelog_merge plugin,
+          ;; there are normally no conflicts in ChangeLogs.
+          ;; But we still want the dates fixing, like bzrmerge-resolve does.
           (let ((conflicted nil)
                 (files ()))
             (goto-char (point-min))

diff --git a/admin/notes/bzr b/admin/notes/bzr
index 11f0af17a3b0f37538d6158f8bda7ae55d325280..11472e83fc36fcd36e0ca1b3bcbb69397f304690 100644 (file)
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -112,9 +112,12 @@ 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.
 
 Notes: