From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Git to Bzr - what works? Date: Wed, 15 Aug 2012 20:56:01 +0300 Message-ID: <83lihgujim.fsf@gnu.org> References: <5029AB54.8020804@dancol.org> <83fw7pjqav.fsf@gnu.org> <877gt1p7s9.fsf@olor.terpri.org> <837gt0kgyk.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1345053361 30834 80.91.229.3 (15 Aug 2012 17:56:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 15 Aug 2012 17:56:01 +0000 (UTC) Cc: bpt@hcoop.net, emacs-devel@gnu.org To: Fabian Ezequiel Gallina Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 15 19:56:02 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T1hp4-0003PK-I4 for ged-emacs-devel@m.gmane.org; Wed, 15 Aug 2012 19:56:02 +0200 Original-Received: from localhost ([::1]:53168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1hp3-0005wJ-AQ for ged-emacs-devel@m.gmane.org; Wed, 15 Aug 2012 13:56:01 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1hp0-0005w4-OV for emacs-devel@gnu.org; Wed, 15 Aug 2012 13:55:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1hoz-00028i-D8 for emacs-devel@gnu.org; Wed, 15 Aug 2012 13:55:58 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:58062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1hoz-00027G-5G for emacs-devel@gnu.org; Wed, 15 Aug 2012 13:55:57 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0M8T00A005STX900@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 15 Aug 2012 20:55:54 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M8T00AGS5T6ECB0@a-mtaout20.012.net.il>; Wed, 15 Aug 2012 20:55:54 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.166 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:152569 Archived-At: > Date: Wed, 15 Aug 2012 00:08:16 -0300 > From: Fabian Ezequiel Gallina > Cc: BT Templeton , emacs-devel@gnu.org > > 2012/8/14 Eli Zaretskii : > > > > But fastimport doesn't quite work, does it? So in practice, it isn't > > a solution, either. > > > > Did someone try to merge from git repository to bzr repository using > > the bzr-git plugin? > > > > That's exactly how I merged python.el from github to the bzr repo. > > I generated the patches from git repo with git format-patch, modified > paths in patch files with sed to match Emacs file structure, and then > used bzr git-apply with no problems, except for the fact that I had to > create a commit adding a blank lisp/progmodes/python.el after deleting > the old one in order for bzr git-apply to apply patches successfully. That's not what I had in mind. But since yours is a real-life experience, while my idea is a purely theoretical one, perhaps what I say below is much less important. What I had in mind was this: . Use bzr-git to make a bzr branch out of the git repo. (This part does work, I'm successfully tracking several projects that use git this way.) . When you have changes in the bzr repo: . "bzr pull" from the git repo to the bzr branch created above . "bzr merge" to another bzr branch that tracks the Emacs trunk . "bzr ci" or "bzr push" (depending on whether the latter branch is or isn't bound) to the master bzr repo Again, I never tried this, so it might not work at all. If the above works, one could try pushing directly from the bzr branch created from git, thus avoiding another branch and another merge.