Re: include/ merge

[DJ Delorie <dj at redhat dot com>]

Remember, parts of include/* are part of libiberty and need to use the
libiberty change rules.

> Huh?  What's wrong with a ChangeLog split?  I reckon the file had
> grown large enough to justify a split.  Apart from joining the two
> pieces again, what other "right way" do you have in mind?

The problem is that you have to split the gcc/include ChangeLog at the
same time and at the same place, else the merge script gets confused.
It compares the two ChangeLogs, looks for entries missing in
src/include, and assumes that a merge is needed if any are found.

Your mail made it sound like there was a merge glitch, and to fix the
glitch you just moved everything out of the way.  If what happened is
that you split the Changelog (if so, I missed it) and that a merge
un-split it, then we need to clean that up by (again) reverting the
glitch and then figuring out what to do.

I also have to coordinate one of our internal repositories, so I'd
rather in the future if you just asked me to do this so I can keep
everything in sync.

> I'm quite willing to stitch the ChangeLog together again if that's
> what you want..

It depends on exactly what happened.  Was there first a merge glitch,
or did you split it previously just because it had grown large enough?