From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.devel Subject: Re: Using Git to manage your Emacs changes Date: Wed, 07 Apr 2010 22:37:43 +0200 Organization: ThierryVolpiatto Message-ID: <878w8zq9rc.fsf@tux.homenetwork> References: <87eiir3rx5.fsf@master.homenet> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1270672943 15634 80.91.229.12 (7 Apr 2010 20:42:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 7 Apr 2010 20:42:23 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 07 22:42:21 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 1Nzc4q-0005q0-JW for ged-emacs-devel@m.gmane.org; Wed, 07 Apr 2010 22:42:20 +0200 Original-Received: from localhost ([127.0.0.1]:33777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzc4p-0004pE-Vh for ged-emacs-devel@m.gmane.org; Wed, 07 Apr 2010 16:42:20 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nzc4B-00044M-SP for emacs-devel@gnu.org; Wed, 07 Apr 2010 16:41:39 -0400 Original-Received: from [140.186.70.92] (port=35654 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzc4A-00042b-Gt for emacs-devel@gnu.org; Wed, 07 Apr 2010 16:41:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nzc48-00016j-M5 for emacs-devel@gnu.org; Wed, 07 Apr 2010 16:41:38 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:45280) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nzc48-00016Z-C9 for emacs-devel@gnu.org; Wed, 07 Apr 2010 16:41:36 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Nzc46-0005Pr-AS for emacs-devel@gnu.org; Wed, 07 Apr 2010 22:41:34 +0200 Original-Received: from 26.211.85-79.rev.gaoland.net ([79.85.211.26]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 07 Apr 2010 22:41:34 +0200 Original-Received: from thierry.volpiatto by 26.211.85-79.rev.gaoland.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 07 Apr 2010 22:41:34 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 48 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 26.211.85-79.rev.gaoland.net Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAElBMVEUHBARgJRFPS0WbMBTC TSG/uJs0yyVHAAAACXBIWXMAAAsSAAALEgHS3X78AAAACXZwQWcAAAAwAAAAMADO7oxXAAABpUlE QVQ4y3VTQXKDMAyUnD7AwvQOhtxj5N4LFh9ow/+/UtlpM0BczWSS0Wola7UBeEb3+3kJ/5p9ZLz3 UI0n0J0Y4K/lh1nG24FhlJOR2LdSKtpV5gfi/Zd+NdaJBbB4D5N0JnfUIVp6obZURkJwS2a8b9uX AkgxA5gCEcknAH1s2z0DPooWmjGKcJR+HNZt+9bm0GtGRycRuZGs98Ffr02vABWGopIAhmXmxnQN BwBXZjgFLHRoqbfeYxCLWqsjLyKhbEHW+A5nEs699Q2O80ALrgHTmUTy6P0MnKyKQpKHpoNWokxs F0D5VegvWmEozyE6nuMiS98mWzlUQ9bW8qYfqOaFtzWlYCqGeIs6HEyl08jkrxUG9MF5ipXpOOpd ZMoXPPVSLWJiiwNNB+eRSyxJZmQKcacikgucnCRiHuJOLmyYJRDPwOqAvY4pA+Wy+VS8G26BAsdb Ph2Hw7ORy/H0IOG0TnaM8Cp0XrFYyU0v2z8AqkifPVbLZ0qo/gsRg60C7p+8Ov9jrUIxFde+jnAq X42hyp/c+ZcnVyUYBarrqZt3+R8450png3cWKgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAwOC0wNS0z MVQyMjoxNDoyMiswMjowMK3VBDcAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDctMTAtMjhUMTc6MDg6 NDgrMDE6MDDLdIcLAAAAEXRFWHRqcGVnOmNvbG9yc3BhY2UAMix1VZ8AAAAgdEVYdGpwZWc6c2Ft cGxpbmctZmFjdG9yADJ4MiwxeDEsMXgxSfqmtAAAAABJRU5ErkJggg== User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:UVfsd4Dp+I/oKhaqNZv8nKRoL6s= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:123336 Archived-At: Why not using a stack of patchs like stgit or mercurial qpatchs. You can then apply these patchs to bzr repo. Giuseppe Scrivano writes: > 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 > > > > -- Thierry Volpiatto Gpg key: http://pgp.mit.edu/