From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giuseppe Scrivano Newsgroups: gmane.emacs.devel Subject: Re: Using Git to manage your Emacs changes Date: Wed, 07 Apr 2010 22:53:58 +0200 Message-ID: <87eiir3rx5.fsf@master.homenet> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1270670000 4111 80.91.229.12 (7 Apr 2010 19:53:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 7 Apr 2010 19:53:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 07 21:53:18 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NzbJI-0000WX-D6 for ged-emacs-devel@m.gmane.org; Wed, 07 Apr 2010 21:53:12 +0200 Original-Received: from localhost ([127.0.0.1]:52710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzbJH-0003w9-Uz for ged-emacs-devel@m.gmane.org; Wed, 07 Apr 2010 15:53:11 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzbJD-0003vu-5s for emacs-devel@gnu.org; Wed, 07 Apr 2010 15:53:07 -0400 Original-Received: from [140.186.70.92] (port=58000 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzbJB-0003vm-V1 for emacs-devel@gnu.org; Wed, 07 Apr 2010 15:53:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzbJA-0004sQ-Lw for emacs-devel@gnu.org; Wed, 07 Apr 2010 15:53:05 -0400 Original-Received: from joe.mail.tiscali.it ([213.205.33.54]:53814) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzbJA-0004sE-Ee for emacs-devel@gnu.org; Wed, 07 Apr 2010 15:53:04 -0400 Original-Received: from master.homenet (84.222.169.111) by joe.mail.tiscali.it (8.0.031) id 4B94E617011249AF; Wed, 7 Apr 2010 21:53:01 +0200 Original-Received: from gscrivano by master.homenet with local (Exim 4.71) (envelope-from ) id 1NzcG6-0001We-Bl; Wed, 07 Apr 2010 22:53:58 +0200 In-Reply-To: (John Wiegley's message of "Wed, 7 Apr 2010 15:23:13 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:123328 Archived-At: I have some notes on your script: John Wiegley writes: > git checkout ${1:-upstream} > git format-patch ..master > > for i in [0-9]*.patch; do > echo Applying $i > > patch -p1 < $i I am not sure the script handles added and removed files, probably you must explicitly call bzr add|rm. > grep ^Subject: $i | sed 's/^Subject: \[PATCH\] //' > /tmp/msg.$$ > > perl -ne 'print if /^$/ .. /^---/;' $i | \ > perl -ne 'print unless /^---/ .. eof()' | \ > tail +2 >> /tmp/msg.$$ tail -n +2 > bzr commit -F /tmp/msg.$$ I think it is desiderable to keep the original author and commit time as well. Cheers, Giuseppe