From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Fabian Ezequiel Gallina Newsgroups: gmane.emacs.devel Subject: Re: Git to Bzr - what works? Date: Wed, 15 Aug 2012 00:08:16 -0300 Message-ID: References: <5029AB54.8020804@dancol.org> <83fw7pjqav.fsf@gnu.org> <877gt1p7s9.fsf@olor.terpri.org> <837gt0kgyk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1345000104 9814 80.91.229.3 (15 Aug 2012 03:08:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 15 Aug 2012 03:08:24 +0000 (UTC) Cc: BT Templeton , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 15 05:08:24 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 1T1Ty3-0004ha-1c for ged-emacs-devel@m.gmane.org; Wed, 15 Aug 2012 05:08:23 +0200 Original-Received: from localhost ([::1]:40181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Ty2-0001GH-0Q for ged-emacs-devel@m.gmane.org; Tue, 14 Aug 2012 23:08:22 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:54760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Txz-0001G5-L1 for emacs-devel@gnu.org; Tue, 14 Aug 2012 23:08:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Txy-0002Qr-R9 for emacs-devel@gnu.org; Tue, 14 Aug 2012 23:08:19 -0400 Original-Received: from mail-wg0-f49.google.com ([74.125.82.49]:59903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Txx-0002QO-Fy; Tue, 14 Aug 2012 23:08:17 -0400 Original-Received: by wgbez12 with SMTP id ez12so799038wgb.30 for ; Tue, 14 Aug 2012 20:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=mfQ2hOcTlziyrnEwLX2Xfhtdm3Q8VQzpnFXA/LLhHD4=; b=nXIE5xkedwaOsinGDqjD+OpuNVViBGApipFxcfo+IG5/zCjKtPJ2TDcB/OAflN2G1T uyrYwH38ZKqamXT763qfeTxfFDs8NB8Dfvzgv913gt+iyactyM5koSn0oBcDkkdxY0MA o1Hm687i+DN6zh6WGN+KK4jJSNNVSOcRvyZ4gb5+KPJvGqoQ8aHYRDikYkFca73Y3Tfx 0j82smGsd7VqedPleQaKQvvn0alE7h87MXWRgwJoSEaM0vKv7UC2o34YjX+gQIpNp9do CAUBUtAe3q0o/Mi7Bz6qlJ+vAnDgiVFRPKJCvDb+CYqRafEvRfHuu2HlRfa+rVKJLbXN akWw== Original-Received: by 10.180.78.135 with SMTP id b7mr33260590wix.11.1345000096258; Tue, 14 Aug 2012 20:08:16 -0700 (PDT) Original-Received: by 10.227.213.10 with HTTP; Tue, 14 Aug 2012 20:08:16 -0700 (PDT) In-Reply-To: <837gt0kgyk.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.49 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:152532 Archived-At: 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. Regards, Fabi=E1n