We want to migrate from svn to git permanently to be able to use git's better features in terms of branching and collaboration.
Our current svn repository looks like this
svnrepo/ frontend/ trunk branches/ ng/ ... tags/ 1.x ... backend/ trunk branches/ ng/ ... tags/ 1.x ...
The working layout is that we check out the frontend project and inside this, we create a backend folder and checkout the backend project.
We now want to migrate to git, and give up the splitting between frontend and backend (in terms of being separate projects) because it gives us more problems than advantages. We want them both to be in a single git repository.
I wanted to use svn2git for the conversion. Unfortunatly the latest development all happened in a branch, and not in trunk, but I think this should not be a problem for svn2git. So the new git repository layout should look like this:
/ => svnrepo/frontend/branches/ng /backend => svnrepo/backend/branches/ng
Where => means "migrated/converted from".
For the conversion it is not necessary for us to convert all the tags and branches from the svn repository over to git. This is not important for us. What is important however is, that we have the full history of all commits to all files in the branches/ng directory, going back to the branching from trunk and all commits that happened in trunk before that. And we want all these commits to be with the mentioned layout in a single git repository. Is this even possible? And how would we do this?