Menu
Let's say I have A: /A_Project/trunk/A and B: /B_Project/trunk/B in my SVN. I want to merge A with B and store it in B. I've used the 'merge two different trees' options in my TortoiseSVN GUI. Everything is fine except the final revision does not have change-log of the A tree!
The question is: how to merge two different trees and retain logs from both of them in the final revision?
Thanks for your help!
350
In the From URL option, you should specify the branch to which you want to merge. For example, assume that there are 2 branches, branch A and branch B , and you want to merge branch B to branch A . In TortoiseSVN, click on Merge option and then select Merge two different trees option.
Create an SVN repository locally. Perform the actions listed above for the dump files. Verify the repository structure is correct with your favorite client. Create a dump file for the combined repositories.
Honestly, my guess is that Tortoise is just creating a working copy of branch B, inserting the code from tree A, and merging as if that was just one massive coding excercise.
I don't believe SVN natively supports merging between projects because revision numbers (and hence the attached commit logs) would obvious conflict as both projects have revisions 1..n.
So I don't know if what your looking to do is possible.
For details on using the command line interface for merge I reccommend the Subversion bible:
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html
71
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
