Resolve conflict on binary file after merge

Hello,

say we have a WC with no uncommited changes and merge changes
from a branch, which leads to conflicts.

When trying to resolve a conflict on a binary file using
"Resolve conflict using "mine"" in the Check for modifications
dialog, TSVN asks for confirmation and does not seem to do
anything afterwards. The file is still in state of conflict and
the merge-left and merge-right files are still present.

Since nothing happend after choosing the menu entry and confirming,
I consider this to be a bug. I think "Resolve conflict using
"mine"" should do the same as "Resolved" in this case.

"Resolve conflict using "theirs"" "resolves" the conflict -
the conflict files are deleted. Nevertheless this option is
misleading - it seems to use the pristine copy from the .svn
directory - which in this case was identical to the WC file
both before and after the merge.

I'm not sure what the correct behaviour would be - in my use
case I'd want it to use the merge-right file or let me choose
the file to use.

TSVN 1.4.3 release and 1.4.3 8901 dev, both 32 Bit.

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 16 21:06:01 2007