Am 19.08.2017 um 14:45 schrieb Jan Teske: > Is there any way to fix such branches from subfolders in a way that they > integrate correctly with the converted git repository, without losing any (or > at least too much) history? If this is not possible with git-svn directly, > maybe I could prepare the SVN repo or post-process the converted git > repository somehow?
You can use `git replace --graft` to connect the first commit of the loose branches with their source. After all connections are in place you can use `git filter-branch` to make the replacements permanent. This will not change the content or directory structure of branch1 or branch2 but the diff with their parent commits will show up as a huge delete/rename operation. So merging/Cherry-picking between trunk and branch1/branch2 will be ... challenging.
