On Tue, Jul 6, 2010 at 1:01 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 05.07.2010 22:47, Stephen Schaub wrote:
>> Using: TortoiseSVN 1.6.9
>>
>> Steps to reproduce:
>>
>> 1. Create empty SVN repository with standard trunk and branches
>> directories (empty trunk). Create a branch of the trunk.
>>
>> 2. Create a new file with the same name in both trunk and branch. Commit
>> both.
>>
>> 3. In the working copy of the branch, use TortoiseSVN to merge the trunk
>> to the branch. A tree conflict results.
>>
>> 4. In the Merge results dialog, right-click the tree conflict and choose
>> Edit Conflicts. The dialog reads “The last merge operation tried to add
>> the file ‘foo.txt’, but it was already added locally.”
>>
>> 5. Click “Keep the file from the repository.”
>>
>> Expected: The version from trunk is saved to the working copy.
>>
>> Actual: The version from the working copy is retained.
>>
>> Am I misunderstanding the dialog?
>
> No, but the problem here is that the svn API isn't really 'finished'
> yet. Meaning: the API has all the parameters to do what the button says
> (and it does so in most tree conflict scenarios), but not in this
> specific one. Since the file was already added locally, the version from
> the repository wasn't saved anywhere so the API simply fails here.
> Problem is: the svn API doesn't return an error but returns 'success'
> even though it only marked the conflict as resolved but didn't really do
> what it was told. If it would throw an error, TSVN would show that error.
Thank you for the detailed explanation. It makes sense.
Shouldn't this behavior be reported as a bug, at least against TSVN,
if not also against the svn API? It bit one of my colleagues. The fact
that the underlying svn API is not reporting an error does not mean
that the behavior should be considered "works as intended" in TSVN.
>
> in SVN 1.7 handling of tree conflicts (and resolving them) should be
> improved a lot. So let's hope these issues will get resolved then too.
>
> Stefan
Indeed - something to look forward to.
--
Stephen Schaub
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2630173
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-06 19:33:17 CEST