Re: [PATCH] sim: ChangeLog: move arch-specific entries into the arch dir

[Andrew Burgess <andrew.burgess@embecosm.com>]

* Tom Tromey <tom@tromey.com> [2021-01-07 13:57:14 -0700]:

> Mike> merging them into one causes extra pain due to conflicts.  having sep
> Mike> arch ones alleviates that a little as you don't normally have people
> Mike> working on the same arch at the same time.
> 
> Mike> ideally we'd throw away these archaic ChangeLog files entirely.  they
> Mike> are a huge waste of time for everyone and would be much better served
> Mike> writing proper git commit messages.  it isn't the 80s/90s anymore.
> 
> I'm +1 on that, but other maintainers like them, so we've been keeping
> them around.

For the record I see them as a waste of time too.

> 
> For conflicts, I do this:
> 
> https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/
> 
> I rarely have ChangeLog conflicts or snafus.  I can't really recall the
> last one.

That's what I use too, and I haven't had a ChangeLog conflict in
years.

Thanks,
Andrew