Svn (with git frontend), merge with different directory structure
I have a subversion repository with a directory structure:
frontend
backend
+ a
+ b
On another branch, someone put subfolders a and b in the root directory and deleted other stuff (frontend, backend).
a
b
Now I need to merge this branch back into the trunk (backend-folder). How can I do this so as not to lose history from branches? I am using git to access and work with a subversion repository.
a source to share
git-svn
should be able to properly import the history given it uses the default setting --follow-parent
:
--follow-parent
This is especially useful when we are tracking a directory that has been moved inside a repository, or if we started tracking a branch and did not track the part it originated from.
This feature is enabled by default, use--no-follow-parent
to disable it.
If that doesn't work, making the correct change (i.e. merging this branch to revert the original file already imported with git-svn
, the directory structure) directly into SVN before git-svn
, as khmerbaise suggests in a comment, might be a good workaround.
a source to share