From: Marc Branchaud <marcnarc@xiplink.com>
To: git list <git@vger.kernel.org>
Cc: normalperson@yhbt.net
Subject: git svn: Supporting multiple branch subdirs?
Date: Fri, 12 Jun 2009 17:46:13 -0400 [thread overview]
Message-ID: <4A32CCA5.7040404@xiplink.com> (raw)
Hi,
I believe I need git-svn to support multiple branch subdirectories.
The motivation for this is the (partial) gitification of the FreeBSD subversion repository. FreeBSD doesn't follow the usual branches/tags/trunk pattern. Instead:
- FreeBSD's /trunk is called /head.
- /head is branched into /stable/X subdirs.
- Each /stable/X branch is sub-branched into /releng/X.Y subirs.
- /releng/X.Y.Z branches are tagged under /release/foo.
I'm only looking to get an updatable mirror of their repo -- I don't (yet) need to push changes back to FreeBSD.
I'd like to modify git-svn to support multiple (at least two) -b parameters, so I could import the FreeBSD repo with something like
git svn init --trunk=head \
--branches=stable \
--branches=releng \
--tags=release \
file:///local/mirror/of/svn.freebsd.org/base/
git svn fetch
Is this approach wise or even feasible? A couple of possible show-stoppers I see are:
- The releng/X.Y branches are created from the stable/X tree, where X itself doesn't exist from the start.
- FreeBSD likes to make single commits that spans multiple branches. This is usually done as a security patch: One commit can, for example, touch /head, /stable/X, /stable/W, and several branches under /releng.
If this isn't completely off the wall, I'd appreciate some pointers on the git-svn.perl code. I've tried searching through the code to see how the -b parameter is handled, but I got lost pretty quickly. How does the fetch command deal with branches?
Thanks,
M.
next reply other threads:[~2009-06-12 21:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-12 21:46 Marc Branchaud [this message]
2009-06-13 11:46 ` git svn: Supporting multiple branch subdirs? 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
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=4A32CCA5.7040404@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).