11 Jul
2011
11 Jul
'11
11:06 a.m.
Hi
Oh, I wasn't aware of special svn merge information and merged changes from the trunk manually. Good to know. Will try that next time.
You can fix up the merge information for the revisions that are already merged from trunk with:
cd<locator-branch> svn merge --record-only -r1891:1973 ^/trunk . svn commit
Then merging from trunk can be just: svn merge ^/trunk .
..Steve
Thanks for the hints! Can you do me a favour and commit that for me? I am using the Eclipse SVN facility only and would have to try a lot how to achieve that with the special "record-only" parameter. Thanks! WanMil