From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Baumann Subject: Re: git-svn and a nested branches folder Date: Tue, 4 Sep 2007 19:40:06 +0200 Message-ID: <20070904174006.GB4538@xp.machine.xx> References: <46DD6EEA.9010304@gmail.com> <86veaqebf1.fsf@lola.quinscape.zz> <46DD718C.7060908@gmail.com> <86r6leeaq7.fsf@lola.quinscape.zz> <46DD77F2.3040000@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Russ Brown X-From: git-owner@vger.kernel.org Tue Sep 04 19:46:54 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IScUG-0004vO-Ul for gcvg-git@gmane.org; Tue, 04 Sep 2007 19:46:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755000AbXIDRqt (ORCPT ); Tue, 4 Sep 2007 13:46:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754997AbXIDRqs (ORCPT ); Tue, 4 Sep 2007 13:46:48 -0400 Received: from matlock.hofmann.stw.uni-erlangen.de ([131.188.24.35]:36401 "HELO mail.hofmann.stw.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754107AbXIDRqs (ORCPT ); Tue, 4 Sep 2007 13:46:48 -0400 X-Greylist: delayed 400 seconds by postgrey-1.27 at vger.kernel.org; Tue, 04 Sep 2007 13:46:47 EDT Received: (qmail 14430 invoked by uid 0); 4 Sep 2007 17:40:06 -0000 Received: from ho135.hofmann.stw.uni-erlangen.de (HELO localhost) (p.b@hofmann.stw.uni-erlangen.de@172.17.27.135) by mail.hofmann.stw.uni-erlangen.de with SMTP; 4 Sep 2007 17:40:06 -0000 Mail-Followup-To: Russ Brown , git@vger.kernel.org Content-Disposition: inline In-Reply-To: <46DD77F2.3040000@gmail.com> User-Agent: Mutt/1.5.16 (2007-06-11) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Sep 04, 2007 at 10:21:22AM -0500, Russ Brown wrote: > David Kastrup wrote: > > Russ Brown writes: > > > >> David Kastrup wrote: > >>> Russ Brown writes: > >>> > >>>> I'm having some trouble with using git-svn to fetch a repository, and I > >>>> think it's because the repository doesn't store branches as a flat list > >>>> directly under the 'branches' directory. > >>>> > >>>> Basically, we have a structure like this: > >>>> > >>>> | > >>>> +-trunk > >>>> +-tags > >>>> +-branches > >>>> + category-a > >>>> + branch-a > >>>> + branch-b > >>>> + category-b > >>>> + branch-c > >>>> + branch-d > >>>> > >>>> etc. category-a and category-b are simple directories created using svn > >>>> mkdir. The branches are created using svn cp. > >>>> > >>>> It helps us to organise the branches better, but the rationale is > >>>> besides the point. The problem is that git-svn seems to want to > >>>> treat category-a and category-b as branches, which isn't right at > >>>> all. As a result, git-svn seems to skip most (if not all) revisions > >>>> that occur in these directories and creates a lot of entries in > >>>> unhandled.log. > >>> So what did you specify in your .git/config file regarding the svn > >>> structure? > >> I specified the 'branches' directory, but that's because earlier in > >> the life of the repo we did just do the flat branch layout, but > >> decided to make it more structured once that got unwieldy. > > > > Cough, cough. _What_ did you specify in your .git/config file > > regarding the svn structure? Please quote the section. > > > > Erm, sorry. > > [svn-remote "svn"] > url = svn://svn..com > fetch = trunk:refs/remotes/trunk > branches = branches/*:refs/remotes/* > tags = tags/*:refs/remotes/tags/* > > (URL changed in case it annoys my employers) > > I didn't write this by hand: it was generated by git-svn init. > Try something like this: [svn-remote "svn"] # trunk fetch = trunk:refs/remotes/trunk # branches fetch = branches/category-a/branch_a:refs/remotes/svn/branch_a fetch = branches/category-a/branch_b:refs/remotes/svn/branch_b fetch = branches/category-b/branch_c:refs/remotes/svn/branch_c # tags tags = tags/*:refs/remotes/tags/* (Not sure if wildcards will work here, but I'm sure you could experiment and try it out :-) -Peter