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

[Jaroslav Hajek]

John,

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.


On Wed, May 21, 2008 at 12:29 PM, John W. Eaton <address@hidden> wrote:
> On 21-May-2008, Kim Hansen wrote:
>
> | What about the changelog entry, do you
> | still want that in the email or should it be part of the changeset?
>
> For now, it should be part of the changset, but I'm rethinking whether
> we should continue to maintain ChangeLog files at all since they
> almost always require some work to merge, either because of a conflict
> or because they are inserted in the wrong spot with the wrong date.
>
> jwe
>



-- 
RNDr. Jaroslav Hajek
computing expert
Aeronautical Research and Test Institute (VZLU)
Prague, Czech Republic
url: www.highegg.matfyz.cz