From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Schwingen Date: Tue, 15 Feb 2011 19:50:40 +0100 Subject: [U-Boot] IXP42x patch series version 3 In-Reply-To: <4D591958.1020908@free.fr> References: <1296860763-16149-1-git-send-email-michael@schwingen.org> <20110204235233.CEEA91B765DB@gemini.denx.de> <4D505820.90507@discworld.dascon.de> <4D580ED6.8050404@discworld.dascon.de> <20110213220344.9F737D71A8E@gemini.denx.de> <4D586B59.1000303@discworld.dascon.de> <4D591958.1020908@free.fr> Message-ID: <4D5ACB00.4020300@discworld.dascon.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am 02/14/2011 01:00 PM, schrieb Albert ARIBAUD: > Le 14/02/2011 00:38, Michael Schwingen a ?crit : >> Am 02/13/2011 11:03 PM, schrieb Wolfgang Denk: >>> Dear Graeme Russ, >>> >>> In message you wrote: >>>> For multi-patch series, you only need to put the revision history in the >>>> [00/nn] file - No need to individually annotate each and every patch >>> This is *wrong*. >>> >>> See the Note at bullet 2 at >>> http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions > (I plead guilty, then. I, too, did put patchset history only in the > summary post, and never commented others who did it too) > >> Do you have any advise *how* to do that using git? >> >> Any pointer is fine, I can RTFM if I know where to start. > Git itself won't give you a way to do this. What I do is: > > - when I create a V2 patchset I edit the patch messages manually to add > history (in the summary so far, I'll fix this for future patchsets) and > keep the patch messages around; > > - when I create a V3-or-later patchset, I copy-paste the history from > the previous set then add the new history entry. > > Being a creature of habit, I am used to launching two instances of nedit > with the V(n-1) and V(n) patch sets for this. So in my case, I would need 2*17 editor instances (or more likely 17 sessions with 2 editor instances each), for each patch version. That add quite a lot of work just to prepare otherwise working patches for patchwork. I will see when I find time to re-do the patch series that way, however, I need to say that maintaining patches out-of-tree seems less work than getting the patches into mainline using this procedure. cu Michael