Re: Classpath remerge

[Bryce McKinlay <bryce at waitaki dot otago dot ac dot nz>]

Tom Tromey wrote:

>>>>>>"Bryce" == Bryce McKinlay <bryce@waitaki.otago.ac.nz> writes:
>>>>>>
>
>Bryce> Well, this is the way I usually do it. I think it makes it a
>Bryce> bit easier when looking through the changelog if you want to
>Bryce> track down a specific change.
>
>My practice is that if the change is relatively small and
>self-contained then I preserve the ChangeLog entry.  This does make it
>easier to track down the change, since you can just look for matching
>text.
>
>OTOH, if it is a major change (for instance, many changes to a file
>over a period of some time), then I tend to just put "merged with
>Classpath" into the ChangeLog.  The latter isn't ideal, but pulling
>out all the different entries is a pain, and the history is always in
>Classpath anyway.
>

I think this sounds reasonable. So we include the origional ChangeLog 
entries if it is practical, otherwise just write a note saying that it 
was merged alongside a list of the files that got changed.

regards

Bryce.