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

Re: bug? Deleting a file while another user changes it

From: Mark Phippard <markp_at_softlanding.com>
Date: 2005-11-13 15:13:00 CET

> 6. Bar.java (14) displayed in the sync view becomes Bar.java (BASE). It
> becomes from a conflict into an incoming change. The file in package
> explorer is marked in error (red cross). The content of the file is the
> latest version.

I am not sure what Revision this (BASE) change was made in Subclipse but I
have noticed it in testing and believe it is intentional. I think it was
done for scenarios where it would make sense for the compare option to
compare against the BASE revision instead of the server. (I am obviously
not the one that made this change or I would have a better answer).

I do not believe the red cross is an error marker, I believe it is a Delete
decorator. I have seen it on a few occasions recently. I have not had a
chance to check the code to see what scenario we display it. One of the
reasons I wanted you to replicate this from the command line is that I
wanted to see how svn status portrayed your WC after the same steps.

At the point you get that error you seem to want to resolve something
(perhaps because you think that decorator is an error). I think the next
step is to either commit your delete or revert your local modification.

None of this is to say that I do not agree that there are issues here.


Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
Received on Mon Nov 14 01:13:00 2005

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

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