Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I want to perform a major codebase reorganization, but I’m unable to proceed unless I can provide a way for trunk fixes to be easily applied to branches that were taken before the reorganization.
One approach I was considering was to apply the reorganization to to all of the support branches, but this is potentially destabilising.
A preferred approach would be to provide a merge tool that can take into account the updated file locations. Any suggestions on how I could implement this?
I’m in the same situation where branches aren’t always just maintenance related nor hotfix related. We often have to maintain multiple active stabilization branches and must merge between them. We don’t have the luxury of mixing scope to practice continuous integration on a trunk.
We resort to performing merges at a more granular level. If a folder is moved, perform the merge directly from the old location in one branch to the new location in the other branch. I’d also highly recommend that you use the “svn move” to do the original restructure, it ensures ancestry is understood.
Either way, it’s not pleasant and very manual. Keep good records.