public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Brian Gernhardt <brian@gernhardtsoftware•com>
To: Git Mailing List <git@vger•kernel.org>
Cc: Eric Wong <normalperson@yhbt•net>
Subject: Git-SVN & subdirectory branches
Date: Fri, 27 Aug 2010 12:37:42 -0400	[thread overview]
Message-ID: <F393D37F-9BDE-4F29-94E9-806AF88D1A30@gernhardtsoftware.com> (raw)

I'm working on creating a git mirror of the MINIX 3 repository.  I'm encountering a problem with the fact that the branches and tags often but not always are based on a subdirectory of trunk.  It appears that when git-svn encounters one of these branches it starts over from revision 1.  Is there a good way to deal with this or should I just let git-svn clone it as it will and use something like filter-branch to clean it up?  (Note that I intend this to be an ongoing mirror so any solution has to let git-svn work properly afterwords.)

In particular, MINIX's trunk contains a bigports and a src subdirectory and some branches (and tags) have both subdirectories, but more often they branch just the src (kernel and servers) directory.

For visual learners:

/trunk
  /bigports
  /src
    /boot
    /commands
    ...
/branches
  /R3.1.0
    /bigports
    /src
  /R3.1.7
    /boot
    /commands
    ...

The SVN repo can be browsed at https://gforge.cs.vu.nl/gf/project/minix/scmsvn/?action=browse&path=/ but people should be careful trying to clone it fully using git-svn due to the issue above.  I finally just used svnsync to create a local copy to clone from.

~~ Brian

             reply	other threads:[~2010-08-27 16:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-27 16:37 Brian Gernhardt [this message]
2010-08-28  1:45 ` Git-SVN & subdirectory branches Jonathan Nieder

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=F393D37F-9BDE-4F29-94E9-806AF88D1A30@gernhardtsoftware.com \
    --to=brian@gernhardtsoftware$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --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