From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Felipe Contreras Newsgroups: gmane.emacs.devel Subject: Re: git-1.8.2 support pulling from and pushing to a bzr branch Date: Wed, 1 May 2013 01:16:59 -0500 Message-ID: References: <87vc7qurlt.fsf@bernoul.li> <87wqs2v1gj.fsf@dex.adm.naquadah.org> <877gjz3bwf.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1367419430 22882 80.91.229.3 (1 May 2013 14:43:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 May 2013 14:43:50 +0000 (UTC) Cc: Felipe Contreras Garza , emacs-devel@gnu.org To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 01 16:43:50 2013 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 1UXYG1-0008No-IV for ged-emacs-devel@m.gmane.org; Wed, 01 May 2013 16:43:45 +0200 Original-Received: from localhost ([::1]:55614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXYG1-00070A-03 for ged-emacs-devel@m.gmane.org; Wed, 01 May 2013 10:43:45 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXQLe-0004sf-Hd for emacs-devel@gnu.org; Wed, 01 May 2013 02:17:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXQLd-0007DA-9U for emacs-devel@gnu.org; Wed, 01 May 2013 02:17:02 -0400 Original-Received: from mail-la0-x22f.google.com ([2a00:1450:4010:c03::22f]:38909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXQLd-0007Cy-21 for emacs-devel@gnu.org; Wed, 01 May 2013 02:17:01 -0400 Original-Received: by mail-la0-f47.google.com with SMTP id em20so1106847lab.34 for ; Tue, 30 Apr 2013 23:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=ohSUO4dqQSLWZYdSMNGjTIq4eWBd0lSS8/h8g2DSAAM=; b=pRVOg0NbruEIa+JupDXaBAmcFnLj3xZMkT/umZ8tyqhCnN1u6sG4C5YRqlcDFZsj7q QSDZpzL3MvXOXfgd4JNKvwMGrVvkxg08QZmG56wbSYXZSrGsIcGuOAAf7Ih8Lx7E7APF tsy5jZAyYPtLIphC3UjejJmCc9WZV0GQjLmDgg0GJNAUJt0//teXPOw+264MqRb3gPAw K7YYZojNK3JsROPHafBH/WxPl+WgssFAzJMc2GHgVyodOuC8+Jr7cn57fs773C97/oEH w+7C0gGI+O0P3ECpFVArNlcfZNfSKvhySsVpBru21b+VNCKt3G7M+xcfNehuUOYUM8SP AQ3w== X-Received: by 10.152.19.10 with SMTP id a10mr521168lae.8.1367389019565; Tue, 30 Apr 2013 23:16:59 -0700 (PDT) Original-Received: by 10.114.83.167 with HTTP; Tue, 30 Apr 2013 23:16:59 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22f X-Mailman-Approved-At: Wed, 01 May 2013 10:43:42 -0400 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:159239 Archived-At: Hi, On Tue, Apr 30, 2013 at 5:24 AM, wrote: > I have now pushed a test commit to my xwidget branch using the latest > version of Felipes git-remote-bzr. > > https://raw.github.com/felipec/git/fc/master/contrib/remote-helpers/git-remote-bzr > > Felipe was very helpful during this test. I think more of us should try > it out now. I just pushed a small fix so you can clone the whole repository. These are my recommended instructions: If you already have a bazaar branch, for example: % bzr branch bzr://bzr.savannah.gnu.org/emacs/trunk emacs-trunk Then you do: % git init emacs-git % cd emacs-git % git remote add origin bzr::bzr://bzr.savannah.gnu.org/emacs % bzr init-repo --no-trees .git/bzr % bzr branch ../emacs-trunk .git/bzr/foobar # setup repo objects % rm -rf .git/bzr/foobar # remove cruft % git fetch origin If something fails in the fetch phase, not everything is lost, you can report the problem, and the information in the emacs-git repository might be useful for debugging the issue. Then you can recover without starting from scratch. If you are feeling adventurous, you can of course try the whole thing in one go: % git clone bzr::bzr://bzr.savannah.gnu.org/emacs emacs-git You will be able to keep track of all the branches, as if they were native to git: % git branch --remote % git checkout -b xwidget origin/xwidget # hacking % git push The only limitation is that you cannot use the idiom 'git push origin cur-name:new-name', so the local branch should have the same name as the remote branch. Once you are happy with the setup, you should probably compress the git repo: % git gc --aggressive Unfortunately, the emacs repo is too big, and too disperse (since it came from a remote helper) for my poor machine to handle without running out of memory, so, I have to do this: % git config gc.aggressiveWindow 50 Moreover, if you are only interested in a couple of branches, you can specify them with: % git config remote-bzr.branches 'trunk, xwindow' I also read a complaint about git always showing 'new branch', but that's not a problem of this remote helper, it's in the git infrastructure itself[1]. Good luck :) [1] http://article.gmane.org/gmane.comp.version-control.git/220798 -- Felipe Contreras