RE: Re: Merge problem SVN 1,8

Hello,

thanks for your reply in the first place, but what I don't understand is, why conflict handling in normal situations (e.g. both parties modified the same file from trunc) works with WinMerge and conflict handling in case of merge doesn't. The necessary files are there, it seems that only the wrong ones get passed to WinMerge.

Means: a logic change of TSVN (maybe selectable as logic) could solve that problem. That is: assuming the WC of the trunc I want to merge the branch into is current, but anything else will be problematic anyhow.

In case of my example TSVN I do not understand why my .c file is set back to some older state after creating a backup of my WC version to .working in my WC. For me this looks superflous. Would you please care to explain to me why this step is necessary?

In a normal conflict case during update the file in my WC is not being set back, that's why WinMerge works in this case.

Regards

Markus

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084516

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-04 09:53:37 CEST