Merge Question smartsvn version 7.6

Hello,  I don't believe we have the optimal branching set up, but it is what I have to work within at the moment, so I'm hopng to find out if smartsvn has a way to accomplish what I'm attempting to do.    Under branches, on one branch, I have some programs as they would need to be to release at this moment. Changes were made to production code and committed. (around 80 programs)    Under branches, in another branch, we have the developer's inflight changes to all programs, some of the programs mentioned in the first branch are contained in this with different modifications, some not contained in it at all.    Under trunk, we have a branch that contains our code that is in our production environment.    What is the best/easiest/safest way to take the difference between what is in the first branch and production, and add it to the second branch so I can commit those changes as being the current changes necessary for this project.    Hopefully, I haven't blown anyone's mind or made them shudder too hard.

Last updated 8 years ago

Hi there,  Just had a look at the merging chapter in the red-bean book and I believe this section should do what you want: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax  It's talking about merging the differences between two branches into the trunk, but it could just as easily do what you need (i.e. merge the differences between branch and trunk into a third branch).  Hope that helps?