[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CEDET Merge

From: David Engster
Subject: Re: CEDET Merge
Date: Fri, 20 Jan 2017 23:20:05 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux)

Karl Fogel writes:
> David Engster <address@hidden> writes:
>>Edward John Steere writes:
>>>> Things have gotten easier since the actual ChangeLog files get generated
>>>> from the commit message. I would try to manually commit the changes with
>>>> proper commit messages, so we would retain the history with the
>>>> exception of the date of the change, which would be from the day of the
>>>> merge.
>>>> -David
>>> This sounds like a lot of work and the outcome sounds right.
>>It's not that bad. 'format-patch' gives me a nice list of patches where
>>I can correct the paths with 'sed' and fix up the commit messages. It's
>>only about 100 patches, so I don't think it will take long.
> Regarding the earlier point about retaining history "with the exception of 
> the date of the change":
> 'git commit' takes an optional '--date' option:
>    --date=<date>
>      Override the author date used in the commit.
> So even the date of each change could be correct.

Yes, 'git am' does that automatically. However, I always followed the
general rule that the generated ChangeLogs should have the date when the
change enters the Emacs repository, so I'm not sure if I should even
retain the original date?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]