Re: ChangeLog files in changesets (was: Re: Initialization of load_path at startup)

[John W. Eaton]

On 21-May-2008, Jaroslav Hajek wrote:

| what version of Mercurial do you use? I've just imported an older
| patch (the matrix_type improvement) and the ChangeLogs were merged
| smoothly. The entry is even included at an appropriate place (i.e. the
| dates are sorted). I think I haven't had problems with this since I've
| upgraded to Mercurial 1.0. Perhaps ChangeLogs are treated specially
| now.

But that's not what I'd like to happen when I include changes.  I
think the ChangeLog should reflect when the changes were made to my
sources.  I've been importing changes with Mercruial Queues so that I
can fix up conflicts in a merge before committing changes to the
archive, or merge several changesets into one, etc.  That way, the
revision history in the public archive is clean, not a spaghetti mess.
The only thing that is a constant hassle in this way of working is
dealing with ChangeLog files.  So, I'm trying to decide what is the
best way of working here.

jwe