I have a repository in which I’ve created a branch which got its development over today. But there were some changes on the trunk so I have to merge the trunk into branch then continue the process.
First I tried to use the reintegrate feature on eclipse, but I get an error:
Merge operation failed
svn: Retrieval of mergeinfo unsupported by 'http://192.168.0.1/svn/gestaoconfig'"
Then I tried to use the main tab (URL) which should be normal, but somehow all the files are marked in conflict, and the changes made on the trunk do not appear on the local development. The diff shows exactly the same files.
I’ve tried attached the preview message of eclipse, but I couldn’t.
My environment:
local development: ubuntu 12, using eclipse helios, with svn, version
1.6.17 (r1128011).Repository server: fedora 12, with svn, version 1.6.9 (r901367).
As a workaround you might want to check out trunk and branch separately and check whether its feasible to do manual diff and merge.