[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subclipse-dev
Subject:    Re: [Subclipse-dev] [PATCH] Local conflict in synchronize view
From:       Mark Phippard <markp () softlanding ! com>
Date:       2006-03-09 14:10:56
Message-ID: OFDDF9C365.6CCE5109-ON8525712C.004D8DF8-8525712C.004E5077 () softlanding ! com
[Download RAW message or body]

"C. K. So" <kitckso2@gmail.com> wrote on 03/09/2006 02:24:52 AM:

> In synchronize view, it show conflict only if both local and remote are 
> modified. Local conflict are shown as outgoing change only, I think it 
should 
> show as conflict, right?

I do not know that I agree, although I will agree that this whole area is 
confusing.  There are really two types of conflicts that we have to deal 
with. 

Synchronize conflicts.  These are shown as a conflict in the view.
Subversion conflicts.  This would typically show as an outgoing change in 
the view, but I think it would show as a conflict if there was also a 
Synchronize conflict.

The problem is that there are a different set of options that should be 
performed in each case. 

The other minor problem is that Synchronize conflicts might very well be 
something that Subversion could auto-merge on an update.  Ideally, that 
would be reflected in the view, but it is probably a matter of personal 
taste as I know there is a sizable population of users that for whatever 
reason do not trust that tools like Subversion and CVS can auto-merge 
conflicts.

Mark


_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email \
Security Management Services powered by MessageLabs.  \
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: dev-help@subclipse.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]