From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21788 invoked by alias); 23 Feb 2011 09:19:48 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 21777 invoked by uid 22791); 23 Feb 2011 09:19:46 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Date: Wed, 23 Feb 2011 09:19:00 -0000 From: Joel Brobecker To: Pierre Muller Cc: archer@sourceware.org Subject: Re: [Archer] RE: [Archer] Re: [Archer] Archer git account inquiry Message-ID: <20110223091930.GR2617@adacore.com> References: <00a901cbd1cb$01651880$042f4980$@muller@ics-cnrs.unistra.fr> <20110221142157.GF2617@adacore.com> <20110222042450.GJ2617@adacore.com> <20110223033007.GA19610@adacore.com> <000f01cbd339$32d6b6c0$98842440$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <000f01cbd339$32d6b6c0$98842440$@muller@ics-cnrs.unistra.fr> User-Agent: Mutt/1.5.20 (2009-06-14) X-SW-Source: 2011-q1/txt/msg00097.txt.bz2 > So my main question is: what do you use to create your email series > with sub-patches? -- git alone? or stgit, guilt or Quilt? I use git alone (in particular "git rebase -i"). > How do you handle ChangeLog entries for instance? > do you really put them into the commits, but then > they would appear formatted as a diff in the patch also > or do you have special scripts for this? I write the CL entry in the revision history only until the time when I push the change to CVS. That's when I edit the commit again (using "git rebase -i"), adding the ChangeLog entries. I do it at the very last second, because otherwise you have a higher chance of having a conflict when you export to CVS. Note also a super-useful command: git cvsexportcommit. It automates the pushing of a given patch to CVS. -- Joel