Git-svn dcommit branch hoses when using an odd branch structure

Question

I had a boss, elapsed time, who decided to put the svn branches in the same folder as the trunk. Normally, this would not affect me so much, but since I use git-svn, everything is going so well. After I made a selection, she created a folder for each branch in my root folder, so I have three folders, drupal, trunk and client. The drupal folder is git's main branch, the client and the trunk are svn branches.

Merging and doing the job is great, because everything related to git works just fine. However, dcommit is completely closed, it is trying to create a folder called client and one called trunk. I can’t even imagine what kind of chaos this will cause for svn later.

So my question is: what did I do wrong in my .git / config and is there anything I can do to fix this, or will I have to suffer and get back to using svn?

Please do not make me come back. I don’t think I can do it. Bastard boss knows how to leave a legacy.

[svn-remote "svn"]
        url = https://svn.mydomain.com/svn/project_name
        fetch = trunk:refs/remotes/trunk
        branches = *:refs/remotes/*
        tags = tags/*:refs/remotes/tags/*

Usually the branch line will look like this (when using --stdlayout):

branches = branches/*:refs/remotes/branches/*

Thus, the conclusion

ls:

$ ls
client/ docs/ drupal/ sql/ trunk/

git -a output:

* master
  trunk
  remotes/git-svn
  remotes/trunk

Answer 1

I think you changed your .git / config when changing:

branches = branches/*:refs/remotes/*

For

branches = *:refs/remotes/*

.git/config , . ( , http://www.dmo.ca/blog/20070608113513/), ,

[svn-remote "svn34"]
    url = svn+ssh://your-server/home/svn/project-name/branches/3.4.x
    fetch = :refs/remotes/git-svn-3.4

"remote" . ( git -svn docs).

Answer 2

.git/config , glob (http://www.kernel.org/pub/software/scm/ git/docs/git -svn.html # _configuration):

fetch = trunk:refs/remotes/trunk
branches = {client,drupal}:refs/remotes/*