Hi
Consider the following situation
Code was added to the trunk at revision x
A branch was created
The modifications of rev x were removed from trunk in rev x+10
trunk and branch goes their own ways till rev x+100
Now we need to update the branch with changes form the trunk
The problem with a simple "merge a range of revisions" is that due to step 3, the initial branch modifications are being removed. Is there any way to work around this without resorting to manual merge.
Version Info: TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06 Subversion 1.6.9,