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: Fri, 09 Apr 2010 08:04:16 +0200 Organization: ThierryVolpiatto Message-ID: <87bpdtnov3.fsf@tux.homenetwork> References: <87eiir3rx5.fsf@master.homenet> <878w8zq9rc.fsf@tux.homenetwork> <176F7809-3090-4664-BFFF-84F25DDD9F10@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1270793306 10032 80.91.229.12 (9 Apr 2010 06:08:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 9 Apr 2010 06:08:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 09 08:08:24 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 1O07OB-0005Qn-S4 for ged-emacs-devel@m.gmane.org; Fri, 09 Apr 2010 08:08:24 +0200 Original-Received: from localhost ([127.0.0.1]:60625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O07OB-0005HJ-1y for ged-emacs-devel@m.gmane.org; Fri, 09 Apr 2010 02:08:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O07O1-0005G2-1W for emacs-devel@gnu.org; Fri, 09 Apr 2010 02:08:13 -0400 Original-Received: from [140.186.70.92] (port=38146 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O07Nt-0005E4-FU for emacs-devel@gnu.org; Fri, 09 Apr 2010 02:08:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O07Nr-0004Ee-Nd for emacs-devel@gnu.org; Fri, 09 Apr 2010 02:08:05 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:41406) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O07Nr-0004EX-Dp for emacs-devel@gnu.org; Fri, 09 Apr 2010 02:08:03 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1O07Nq-0005J9-Rx for emacs-devel@gnu.org; Fri, 09 Apr 2010 08:08:02 +0200 Original-Received: from 162.211.85-79.rev.gaoland.net ([79.85.211.162]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 09 Apr 2010 08:08:02 +0200 Original-Received: from thierry.volpiatto by 162.211.85-79.rev.gaoland.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 09 Apr 2010 08:08:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 43 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 162.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:Td7/jJx+8nT6Faqx27kRtc62lFg= 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:123375 Archived-At: John Wiegley writes: > On Apr 7, 2010, at 4:37 PM, Thierry Volpiatto wrote: > >> Why not using a stack of patchs like stgit or mercurial qpatchs. >> You can then apply these patchs to bzr repo. > > I don't see how stgit improves anything. Also, I'm using git-bzr > because I need to fetch the mirrored commits back into Git immediately > after pushing, and I'm not sure how often the GitHub emacs mirror > updates itself. I use http://repo.or.cz/w/emacs.git This repo is converted to a hg repo locally. I have cloned this hg repo to another hg repo that handle qpatchs. So i have three repos: git, hg, hg qpatch. 1) on git repo: git pull 2) on hg repo: hg convert (when the repo exists, hg convert is as fast as a pull) 3) on hg qpatch repo: hg pull 4) make some new patchs on hg qpatch repo (i use DVC and anything-mercurial.el) 5) Then you can send patchs to Emacs or apply these patchs to bzr repo directly.(your patchs have to be in git format) The same can be done with stg.(with only 2 repo) -- Thierry Volpiatto Gpg key: http://pgp.mit.edu/