Re: CEDET Merge

[Karl Fogel]

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.

Best regards,
-Karl