insolvable merging problems

[nodje <no...@gmail.com>]

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@subversion.tigris.org].

RE: Re: insolvable merging problems

[nodje <no...@gmail.com>]

thanks for the quick answer Jan.

I think I'll find a solution to get a 1.5 svn rather than resolving conflicts by range.

cheers

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: insolvable merging problems

[Jan Normann Nielsen <sp...@dubbekarl.dk>]

>
> 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!
>   
Hi

It seems to be this bug:

http://svn.haxx.se/dev/archive-2009-06/0178.shtml

which I myself ran into a few weeks ago. My (temporary) solution was to 
use a 1.5.x client to check out a fresh working copy and perform the 
merge without any problems.

Best wishes,
Jan

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].