From: Michael J Gruber <git@drmicha•warpmail.net>
To: Marc Branchaud <marcnarc@xiplink•com>
Cc: git list <git@vger•kernel.org>, normalperson@yhbt•net
Subject: Re: git svn: Supporting multiple branch subdirs?
Date: Thu, 18 Jun 2009 16:03:49 +0200 [thread overview]
Message-ID: <4A3A4945.6050307@drmicha.warpmail.net> (raw)
In-Reply-To: <4A390AFE.5070703@xiplink.com>
Marc Branchaud venit, vidit, dixit 17.06.2009 17:25:
> Michael J Gruber wrote:
>>
>>> (Shouldn't that fetch line be head:refs/remots/head, since there's nothing called
>>> "trunk" in the svn repo? I used git-svn init --trunk=head ...)
>>
>> The left hand side of the refspec refers to the svn repo, the right hand
>> side only names your local ref. Feel free to put "head" there, although
>> this can be confused very easily with "HEAD" which has special meaning
>> in git.
>
> Sure. I was mostly wondering why --trunk=head didn't just reuse the name in my local ref. A minor bug, perhaps?
>
> (And the FreeBSD community commonly refers to that branch as "current", so that's a name I can use locally.)
>
>> P.S.: Let me know if you give it a shot, so that we don't duplicate our
>> waste of time...
>
> I have some cycles to work on this, but I'd need some guidance around git-svn's internals. I'm not even sure where to start implementing the "branches2" hack you described...
Heck it's perl, so don't even try to understand the code - after all,
perl only barely missed the final round in the last competition for the
next cryptographic algorithm!
That being said, I did some clueless hacking in git-svn.perl and let it
run against the freebsd repo. Now, how's that:
~/src/git/git-svn fetch -r1:10000
git branch -r
releng/2.0.5
releng/ALPHA_2_0
releng/BETA_2_0
stable/2.0.5
stable/2.1
tags/2.0
tags/2.0.5
trunk
The revision graph looks OK as well. The git-svn config which I used is:
[svn-remote "svn"]
url = svn://svn.freebsd.org/base
fetch = head:refs/remotes/trunk
branches = releng/*:refs/remotes/releng/*
branchse = stable/*:refs/remotes/stable/*
tags = release/*:refs/remotes/tags/*
No typo there, my git svn knows about "branches" and "branchse" now ;)
BTW: In fact there is overlap between releng and stable branches in the
feebsd repo, see 2.0.5.
I'll send a monkey patch in a minute.
Michael
next prev parent reply other threads:[~2009-06-18 14:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-12 21:46 git svn: Supporting multiple branch subdirs? Marc Branchaud
2009-06-13 11:46 ` Michael J Gruber
2009-06-15 17:29 ` Marc Branchaud
2009-06-17 14:25 ` Michael J Gruber
2009-06-17 15:25 ` Marc Branchaud
2009-06-18 14:03 ` Michael J Gruber [this message]
2009-06-18 14:28 ` Marc Branchaud
2009-06-18 16:00 ` Michael J Gruber
2009-06-18 14:31 ` [MONKEY PATCH] git-svn: allow two branch configurations Michael J Gruber
2009-06-22 14:50 ` Marc Branchaud
2009-06-23 17:02 ` [PATCH] git svn: Support multiple branch and tag paths in the svn repository Marc Branchaud
2009-06-25 9:36 ` Eric Wong
2009-06-25 22:25 ` Junio C Hamano
2009-06-26 0:33 ` Eric Wong
2009-06-26 5:18 ` Andreas Ericsson
2009-06-26 18:11 ` Eric Wong
2009-06-26 19:20 ` Marc Branchaud
2009-06-26 20:49 ` [PATCH] git svn: Doc update for multiple branch and tag paths Marc Branchaud
2009-06-26 20:57 ` [PATCH] git svn: Support multiple branch and tag paths in the svn repository Eric Wong
2009-06-26 21:08 ` [PATCH] git svn: Fix t9138-multiple-branches to use svn_cmd and (cd ...) syntax Marc Branchaud
2009-06-26 21:54 ` Eric Wong
2009-06-27 15:03 ` Marc Branchaud
2009-06-27 22:08 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A3A4945.6050307@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=marcnarc@xiplink$(echo .)com \
--cc=normalperson@yhbt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox