Hello,
Stefan Küng wrote:
> Sven Brueggemann wrote:
>> 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.
> Fixed in revision 8980.
Thanks.
>> "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...
The term "theirs" is fine when updating leads to a conflict, but
I think it's easily misunderstood when merging changes from a branch,
especially for binary files.
Intuitively I would think, that "theirs" refers to a version of the
file in the branch I'm merging from.
Let's look at the problem from another side: When updating a feature
branch or merging a feature branch back into trunk leads to a conflict
on a binary file, you will resolve the conflict either by keeping the
version in the WC ("mine") or by taking the latest revision of the
branch ("To:"-revision of the merge) in 90% of the cases. How do you
achieve the latter by means of TSVN?
Kind regards
Sven
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Mar 19 20:13:11 2007