git svn clone of messy repository

Hi,

I'm in the process of using git svn to migrate several repos over to git and one repo, in particular, has a very challenging format. During the migration, I would also like to reorganize the repo. It looks something like this in svn:

myrepo
  trunk
    project_of_interest
    other_project1
    other_project2
    …
  branches
    FF-1.0
      project_of_interest
      other_project1
      other_project2
      …
   FF-1.1
      project_of_interest
      other_project1
      other_project2
      …

There is also a 'tags' directory at the toplevel, but that's not important to illustrate the issue I'm having. What I would like to do is to migrate ONLY the folder called 'project_of_interest' and preserve it's trunk, branches, and tags. I'm not sure this is possible directly with git svn clone, but here is what I've tried:

git svn clone \ --authors-file=$AUTHORS_FILE \ --prefix="" \ --trunk=trunk/project_of_interest \ --branches=branches/FF-1.0/project_of_interest \ --branches=branches/FF-1.1/project_of_interest \ svn://my-svn-server/myrepo \ project_of_interest.git

The trunk seems to become the 'master' branch just fine, but my svn branches are not pulled down. I'm not sure I have the syntax right or if this is even possible without first reorganizing the svn repo in place, updating the .git/config file, or by some other means. Any help would be much appreciated. I'm happy to provide more info as needed.

Thanks,

Jason

Jason Greenbaum <jgbaum@lji.org> wrote:

By default, the basename ("project_of_interest") is used and you get collisions.

I think this section of the git-svn manpage should help:

| When using multiple --branches or --tags, 'git svn' does not automatically
| handle name collisions (for example, if two branches from different paths have
| the same name, or if a branch and a tag have the same name).  In these cases,
| use 'init' to set up your Git repository then, before your first 'fetch', edit
| the $GIT_DIR/config file so that the branches and tags are associated
| with different name spaces.  For example:
| 
| 	branches = stable/*:refs/remotes/svn/stable/*
| 	branches = debug/*:refs/remotes/svn/debug/*