Git style svn recovery tool

Question

Are there any tools available that will allow me to reinstall the git-style SVN branch to a new parent?

So, in the following situation, I create a function branch, and there are commits in the trunk

              E---F---G  Feature
             /
A---B---C---D--H--I trunk

I am looking for a tool that copies the connecting line and applies commits one by one, allowing me to resolve any conflicts, if any, but each commit retains the same commit message and is still a separate commit.

                    E'---F'---G'  Feature
                   /
A---B---C---D--H--I trunk

Thus, commit E 'will be a commit with the same changes as E, with the exception of the case E causing the conflict, in which case E' will be different from E in that E 'resolves the conflicts, and the same commit message as E.

I am looking for this because it helps in updating branches using a trunk - the svnmerge.py/mergeinfo path does not help, since you still need to resolve your changes when you merge back into the trunk.

Answer 1

In sv , the rebate / a> command for svn. I never used it because it creates a new branch.

Answer 2

To update a branch with changes in the trunk, you simply merge the trunk into a branch with svn merge.

Answer 3

, SVN, git, , , . , git, , " " , .