From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-57604-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 11564 invoked by alias); 2 Aug 2008 17:28:47 -0000
Received: (qmail 11550 invoked by uid 22791); 2 Aug 2008 17:28:46 -0000
X-Spam-Check-By: sourceware.org
Received: from mtaout1.012.net.il (HELO mtaout1.012.net.il) (84.95.2.1)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 02 Aug 2008 17:28:22 +0000
Received: from HOME-C4E4A596F7 ([84.229.228.238]) by i-mtaout1.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0K4Z001JTHVHOYC0@i-mtaout1.012.net.il> for gdb-patches@sources.redhat.com; Sat, 02 Aug 2008 20:28:30 +0300 (IDT)
Date: Sat, 02 Aug 2008 17:28:00 -0000
From: Eli Zaretskii <eliz@gnu.org>
Subject: Re: Subdir ChangeLogs
In-reply-to: <m3tze3weaa.fsf@fleche.redhat.com>
X-012-Sender: halo1@inter.net.il
To: Tom Tromey <tromey@redhat.com>
Cc: stanshebs@earthlink.net, stan@codesourcery.com, gdb-patches@sources.redhat.com
Reply-to: Eli Zaretskii <eliz@gnu.org>
Message-id: <uvdyjl422.fsf@gnu.org>
References: <m3tzeubpw5.fsf@fleche.redhat.com> <487975AF.4030306@codesourcery.com> <m3abglbg8y.fsf@fleche.redhat.com> <m3ljzgzozh.fsf@fleche.redhat.com> <48933ABA.2030601@codesourcery.com> <m3hca4zmo9.fsf@fleche.redhat.com> <4893474C.3000103@earthlink.net> <uej58mv8f.fsf@gnu.org> <m37ib0zhu5.fsf@fleche.redhat.com> <ubq0cmtcg.fsf@gnu.org> <m3tze4y1gu.fsf@fleche.redhat.com> <u8wvfnb5n.fsf@gnu.org> <m3tze3weaa.fsf@fleche.redhat.com>
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2008-08/txt/msg00027.txt.bz2

> 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.