I just committed what I think is an elegant solution to this issue. It
kind of gives us the best of all worlds and some new features to boot.
Here is the commit message:
When an SVN conflict is generated we now create an Eclipse problem marker
it, with the Edit Conflicts action contributed as the Quick Fix to the
This also causes a Warning icon to be displayed in the bottom left
position, as well as to ripple up the folder hierarchy (unless there is
a need to display an error indicator -- which would be common.
Changed the conflicted_ov.gif icon again. This time so that it looked
merged_ov.gif which is what CVS displays in this scenario. This avoids
problem of seeing two warning decorators side by side, and since since the
warning decorator is still associated via the marker, it makes the icons
for the Edit Conflicts and Mark Resolved actions make sense.
One final note -- for existing users, the new "SVN Conflict" problem
appears that it will be turned off by default in their problem filters. So
you have to click the filters button and enable it to see the SVN Conflict
item in the Problems view.
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
Received on Tue Mar 8 06:28:35 2005