Re: Classpath remerge

[Tom Tromey <tromey at redhat dot com>]

>>>>> "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.

This is a bit of a grey area.  If we come up with some standard
procedure and document it somewhere, I'd be happy to change my habits
to match.

Tom