insolvable merging problems

Hi

i'm stuck in my merge operation of a project's trunk into a feature's view with the new 1.6.

I'm facing several 'Local delete, incoming edit upon update' and 'Local edit, incoming delete upon update' which I solve using 'svn resolve --accept' command.
That seem to be working quite good, and in the end I can commit changes in my feature's view.

But the think is, the merge operation never finishes and always end in 'svn: Attempt to add tree conflict that already exists'. If i resolve the current conflicts and re-run the merge operations, it does exactly the same, merges the same files and recreate exactly the same conflicts, no matter how many times I solved them.

This drives me crazy, I can't find any way out.
Please help!

--nodje

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2384227

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-17 09:15:50 CEST