[Emacs-diffs] /srv/bzr/emacs/trunk r103394: Add comments about fixing dates in merged ChangeLogs.

[Glenn Morris]

------------------------------------------------------------
revno: 103394
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-22 19:50:04 -0800
message:
  Add comments about fixing dates in merged ChangeLogs.
modified:
  admin/bzrmerge.el
  admin/notes/bzr

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-02-12 23:37:43 +0000
+++ b/admin/bzrmerge.el 2011-02-23 03:50:04 +0000
@@ -270,6 +270,9 @@
           (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))

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-02-14 02:52:02 +0000
+++ b/admin/notes/bzr   2011-02-23 03:50:04 +0000
@@ -112,9 +112,12 @@
 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: