Re: Conflict revision not notified with right symbol

Not really sure how to answer this.  If you Synchronize your workspace and
there is both an outgoing change and an incoming change to the same file,
it will show as a conflict.  Which is what you say you want.  I cannot
explain why that would not be what you are seeing.  Perhaps you ran an
update at some point so that SVN has already merged those changes into your
working copy.

I will note that SVN also will not allow you to commit without updating.
 So one way or another, if the file in the repository is newer you cannot
commit without first updating.




On Fri, Jan 10, 2014 at 2:58 AM, François Fournel <[email protected]
> wrote:

>  Hi guys,
>
> I was working with subclipse and I did an error due to the fact that
> subsclipe put me in error.
> Use case :
>
> 1) I Checkout a file from a repository, called for instance
> "config.properties"
> 2) -Day 1 : I Checkout the *"lastest revision from repository"* *(say r1)*
>      -Day 2 : I work on the working copy
>      -Day 3 : I'am still working on the local working copy
>      -Day 4 : I decide to synchronize with SVN repository, eclipse open
> the SVN sync perspective.
> 3) - At Day 2, another user checkout the *"lastest revision from
> repository" (say r1)*
>     - At Day 3, this user commit its changed. The *"lastest revision from
> repository" becomes r2*
> 4) - At Day 4, the problem is the symbol that appear on the file
> "config.properties" to possibly commit in the synchronize view (I have done
> changes). The symbol is the grey arrow ("->") where as *it should be* *the
> conflicting red arrow* *EVEN IF the "merge" could be done automatically
> by the comparator editor (possible merge by application)*. Because the
> working copy I commit is not any more issued from the *"lastest revision
> from repository"* *(which is r2)*, but it still r1 ; someone has worked
> and changed this file during my work in progress, my commit is naturally in
> conflict, and then I can't commit safely (without comparing difference).
> This allow to do large commit (several files) *safely*.
>
> Regards.
>



-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3071442

To unsubscribe from this discussion, e-mail: [[email protected]].