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

Re: Conflict handling missing in the "Check for modifications" windows

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 06 Mar 2009 17:11:01 +0100

David Balažic wrote:
> Stefan Küng wrote:
>> David Balažic wrote:
>>> Stefan Küng wrote:
>>>> Sent: Friday, March 06, 2009 4:10 PM
>>>> To: users_at_tortoisesvn.tigris.org
>>>> Subject: Re: Conflict handling missing in the "Check for
>>>> modifications" windows
>>>> David Balažic wrote:
>>>>> Simon Large wrote:
>>>>>> 2009/3/6 David Balažic <david.balazic_at_hermes-softlab.com>:
>>>>>>> Stefan Küng wrote:
>>>>>>>> David Balažic wrote:
>>>>>>>>> TortoiseSVN 32-bit
>>>>>>>>> Conflict handling missing in the "Check for
>>>>>> modifications" windows.
>>>>>>>>> I lost almost an hour on this :-(
>>>>>>>>> The context menu item "Compare with base" brings up
>>>>>> TortoiseMerge,
>>>>>>>>> but the "Mark as resolved" button is disabled.
>>>>>>>> Sure, because if you get the three way diff in
>>>>>> TortoiseMerge, then the
>>>>>>>> "compare with base" does a comparison of your local wc
>>>>>> file with its
>>>>>>>> base and the remove file which also has changes.
>>>>>>>> But since the remote file is in fact 'remote', there is no
>>>>>> conflict in
>>>>>>>> your working copy. So that's why the 'mark as
>> resolved' button is
>>>>>>>> disabled: there is no conflict (yet).
>>>>>>>>> I have to gou to explorer, browse down to the file in
>> question,
>>>>>>>>> right click it, select "Edit conflicts", which brings up
>>>>>>>> the same window
>>>>>>>>> as before, but now the "Mark as resolved" button is enabled.
>>>>>>>>> From here on ti works nicely...
>>>>>>>> In that case, there *is* a local conflict.
>>>>>>>> Use the "edit conflict" button from the CfM dialog if you
>>>>>>>> want the same
>>>>>>>> behavior.
>>>>>>> Yes, but there is no such menu (you meant "menu", right ?
>>>>>> Because there
>>>>>>> are no buttons in the CfM dialog, except Refresh/Check
>>>>>> repository and OK).
>>>>>>> That is the point. If there would be such a menu, I would
>>>>>> simply use it and not
>>>>>>> start this mail thread ;-)
>>>>>> Context menu. Right click on an item in the list.
>>>>> Yes. It has no "Edit conflicts" item.
>>>>> This is what I am saying all the time.
>>>> Is the file even in conflict?
>>> You would know that i you remembered my first mail ;-)
>> I do, but I'm asking for another reason.
>>> Here is a picture, to remove any uncertainity: (attached)
>>> (the version part is pasted from the TortoiseDiff about dialog)
>> Yes, please look at that picture. That's why I asked whether
>> the file is
>> even in conflict: it is *not* in conflict.
> Why does then error with "conflicted state" when I try to update it ?

What error do you get exactly?
Do you really get an error or does the update progress dialog show you
that a conflict happened?

If the latter, then you get the conflict when you update. But as long as
you don't update, you don't have a conflict yet.

> Nevermind. After manual refresh the CfM changes status to "conflicted".
> (now you see why I suggested automatic refresh of CfM)
> (and about "conflicted-after-update": it is obvious that after updating
> a file which has remote and local modification, that is may become conflicted)
> This all was two clicks in other RC systems...

What other RC systems?


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-03-06 17:11:46 CET

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

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