[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Resolve conflict on binary file after merge

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2007-03-20 18:40:27 CET

Hello,

Stefan Küng wrote:
> 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?

Must have misunderstood you. I didn't know that you meant the merge-right
file with "as it is in the repository".

I think it's right to use the merge-right file (although I still have
my doubts about the term "theirs") if it exists, BASE otherwise.
I'll re-test and come back to you if it doesn't work this way.

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 20 18:40:34 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.