问题
So for some reason (miscommunication for what the actual subversion URL is and only 1 person working on the code previously) we have two different subversion repositories with what we want to be the same code. Basically the timeline went like this:
- Created X repository
- Put code in
- Created Y repository
- Put code from X in
- Made modifications to Y
- SVN repo Y got corrupted (so he just stopped committing.. not bothering to say something before the backups replaced themselves)
- I made changes to X
And, so now I need to somehow merge the changes from Y into X. What would be the best method for doing this?
回答1:
- create a branch from x at the revision where y was created
- put the code from y in that branch
- commit
- merge the 'branch-y' to your trunk in x
来源：https://stackoverflow.com/questions/7571805/recovering-from-a-separate-now-corrupt-svn-repository