Re: Subdir ChangeLogs

[Eli Zaretskii <eliz@gnu.org>]

> Cc: stanshebs@earthlink.net, stan@codesourcery.com,         gdb-patches@sources.redhat.com
> From: Tom Tromey <tromey@redhat.com>
> Date: Sat, 02 Aug 2008 10:51:57 -0600
> 
> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> 
> Tom> But I am talking about pulling patches out of the tree and putting
> Tom> them back in after updating.  How are you doing this?
> 
> Eli> I make a diffs file and apply it after updating.  The additions to
> Eli> ChangeLog files need not be changed, except for the date.
> 
> This is great for one patch.
> But how do you do it when you have nine patches?

I generate a separate diffs file for each one of them.  Their dates
give me a hint in which order to apply them, when the time comes.

> Keeping multiple patches in one working tree is also not an option.
> Most of my patches seem to overlap; many of them touch Makefile.in at
> least.

If all the patches are accepted, I see no problem.  If only some are
accepted, and the changes are in overlapping regions, you are out of
luck.  But I don't see how merging doc/ChangeLog will help here.