[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] trunk r116951: ChangeLog fixes
|
From: |
Glenn Morris |
|
Subject: |
Re: [Emacs-diffs] trunk r116951: ChangeLog fixes |
|
Date: |
Mon, 07 Apr 2014 17:38:22 -0400 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Daniel Colascione wrote:
>> Merged entries get today's date.
>
> Why?
Because that's the only thing that makes sense.
If you merge a change originally from emacs-24 2014-04-01 into trunk today,
it goes at the top with today's date, because that is the date it
was added to trunk. Sorry, I don't know how else to explain it...
Again, bzrmerge.el in theory does this for you.
(In practice personally I use bzr's changelog_merge plugin and fix the
dates by hand.)
(I think this is all written in admin/notes/bzr "How to merge changes
from emacs-23 to trunk".)