git & svn externals - a final solution yet?

Question

this is the workflow I currently use for my svn projects (I never use svn branches, and some projects are actively worked on by other people as well):

• on the server, do the inital git svn fetch which might take hours. Also create a 'build' branch.
• on a development machine cloning is now fast: git clone srv://project.git, git checkout build followed by git update-refs ..., git svn fetch to restore the link to the svn repository
• work, commit, work commit, ...
• to check if things are sane, git push build to the server and trigger a build in Hudson for that branch
• to store work so that I can work on it from another machine, also push build branch
• when satisfied, join commits together in logical steps (eg one for each bug), commit to svn and reset everything like git checkout master, git merge build, git svn dcommit, git push, git checkout build, git rebase master, git push build

Enter svn externals. I tried every script here already but all of them fail. My externals are setup like this:

/path/to/x x
/path/to/y/z y/z
/path/to/a/b.file a/b.file

and the scripts do things like trying to create /path/to/x in the root of the filesystem and git svn fetch /path/to/x. Also the single files seem to cause more problems. (subquestion 1: what is the svn:externals format these scripts were written for then?)

It doesn't seem to hard modifying one of the scripts to handle my situation and replicate the directory structure I'm after correctly, but then I'm left with a major problem: if I change a file in both x and y/z directories, I don't see a way to join this into a single svn commit and that is one of the reasons I started using git in the first place.

Hence the question: is there a way I can replicate the above workflow, using only parts of a certain svn repository, in such a way that I can do svn dcommit in the root? I'd prefer a ready-to-use solution that works both on linux and windows.

edit I quickly hacked through one of the scripts I found and made it replicating the directory structure of the svn externals. I cannot clone single files though, here's output:

git svn clone -r HEAD srv://svn/repo/path/to/projects.sln
Initialized empty Git repository in xxx/projects.sln/.git/
Invalid filesystem path syntax: REPORT request failed on '/svn/repo/!svn/vcc/default':
  Cannot replace a directory from within at yyy/git/libexec/git-core/git-svn line 5114

subquestion 2: is it not possible fetching a single file through git svn?

Baese

I found that this script works with the current versions of SVN and Git. – Kettering

@IvanKoblik thanks for posting that. Though I have to admit I just gave up on getting all repositories in sync ans instead forced all collegues to just use git as well :P – Baese

After using it for a while even with the script it is very cumbersome. I think git-svn doesn't cut it for SVN repositories with externals, your solution is the best one there is. – Kettering

Answer 1

Unfortunately, svn's externals are quite flexible. I've run across a number of scripts that treat them as <path> <url>, but <url> <path> is also allowed. So I think some of the scripts are just broken in that regard.

To answer your second subquestion: no. 'git svn fetch' needs to operate on a subtree of Subversion's repo, but it needs to be something it can treat like a branch. The only thing map well into that paradigm is a directory (trunk/, for example). FWIW, Bazaar and Mercurial suffer here too. At the end of the day, Subversion is just a versioned file system, whereas Git has a first class concept of a branch. This is one of those mismatches getting in the way. :-(

Arteriovenous

Answer 2

Just a another note on the second subquestion. As far as I know subversion as of today also does not support svn externals for files, only folders. So I guess such entries in the properties would be invalid. Don't know if there is any tooling which handles this case.

Resonant

While being a major PITA (especially when trying to bridge SVN to Git) file externals are very well possible in SVN. I don’t know since when, but every SVN command–line client that shipped with Xcode since at least version 4.5 did—and those are usually quite outdated. – Zuniga

IIRC file externals require version 1.8 or later on both the client and the server to work properly. – Chadchadabe