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 1.5.9.15518 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 ?
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...
Regards,
David
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1277887
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-06 17:03:01 CET