Fixing a Git SVN Repository with submodules
I have a Git repo cloned with Git-SVN and am now trying to push it back into SVN. The standard
git svn rebase
git svn dcommit
works fine until the point where a submodule was added.
After reading the docs (after of course wasn't ideal) it turns out that using submodules in a git<->svn repo is a bad, unsupported, idea. With all the power of Git th开发者_开发知识库ough I figured there would be a way to fix this.
I've tried using filter-branch to completely eliminate any reference to the .gitmodules file and removed all relevant config entries
I've tried rebasing out of existense the commit where the submodule was added.
I've tried creating a new branch with just the commits I want to add to SVN (i.e. the ones made after the submodule was created) and dcommitting that.
I've tried giving dcommit specific revisions but it seems to ignore me.
Basically any SO answer related to removing a submodule, rebasing and/or dcommitting I've read and tried.
I keep thinking there must be a way to isolate the commits that are missing from SVN (from the commit that added the submodule -> HEAD) and just dcommit those but I can't for the life of me find it.
精彩评论