Re: Resolve conflict on binary file after merge

Sven Brueggemann wrote:

>>> "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.
>
>> I can't see the problem with this. When I choose "Resolve conflict
>> using theirs", the file as it is in the repository is used, not
>> the BASE file.
>
> Maybe I miss something completely here, but BASE *is* the file as
> it is in the repository...

When I do a merge and a conflict occurs, I get an additional file
(merge-right).

BASE: file as it was after the last update
MINE: file with my local modifications
merge-right (THEIRS): file as it is on the branch which is merged in

I'm not sure how you get the BASE file to be the one from the
repository. Can you maybe provide a recipe on how to reproduce the problem?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org