11 Jul
2011
11 Jul
'11
9:03 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