R
R
relgames2013-10-01 00:57:13
CVS
relgames, 2013-10-01 00:57:13

How to fix SVN history after crooked hands?

There is a project with several branches. One alternatively gifted developer made a new branch in his own style - by creating a new folder and stupidly copying all the files and directories. It wasn't discovered right away, but a year later, when he had already committed there, and not only him.
Is it possible to somehow re-link the old and new branch? I think it is necessary to create the branch correctly and then somehow roll out the changes from the “alternative” branch, but I can’t figure out exactly how to do this.
I will be glad to any advice.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
M
mayorovp, 2013-10-01
@mayorovp

svn copy -r pseudo-branch-create-revision -trunk-path-new-branch-path
svn merge -r pseudo-branch-create-revision :HEAD pseudo-branch-path-path-to-new-branch
The history is "lost", but there will be an indication of where to look for it. You can merge in several stages - then the “important” part of the story will be preserved
PS if there are better solutions, it’s interesting to read it yourself.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question