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

Re: SVN conflict decorator/markers -- more

From: Brock Janiczak <brockj_eclipse_at_ihug.com.au>
Date: 2005-03-08 11:54:37 CET

This all sounds pretty cool, will have to give it a try soon. It might
be cool to add marker resolutions to revert and resolve (ie accept yours
and accept mine) as well as edit conflicts.

I am not sure the decorator is the best place to be deleting and
creating the markers. We could remove the markers in the
revert/resolve/edit conflict operations and possibly create them using
the notify handler (not too sure about this though).

cheers,
Brock

Mark Phippard wrote:

>All-
>
>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
>for
>it, with the Edit Conflicts action contributed as the Quick Fix to the
>problem.
>
>This also causes a Warning icon to be displayed in the bottom left
>decorator
>position, as well as to ripple up the folder hierarchy (unless there is
>also
>a need to display an error indicator -- which would be common.
>
>Changed the conflicted_ov.gif icon again. This time so that it looked
>like
>merged_ov.gif which is what CVS displays in this scenario. This avoids
>the
>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
>marker
>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.
>
>
>
>Thanks
>
>Mark
>
>
Received on Tue Mar 8 21:54:37 2005

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