procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add comments about fixing dates in merged ChangeLogs.

Browse source
This commit is contained in:
Glenn Morris 2011-02-22 19:50:04 -08:00
parent 817b48a7bc
commit 59af988b40
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
admin/bzrmerge.el
View file

@ -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))

9
admin/notes/bzr
View file

@ -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: