[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: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-03-08 14:48:34 CET

Brock Janiczak <brockj_eclipse@ihug.com.au> wrote on 03/08/2005 05:54:37

> 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 was thinking about that too, as it would let you do all of the actions
from the Problems view, and not have to expand folders etc... My concern
was that someone would Resolve without removing the markers. Are you
suggesting that we make the three options be:

Edit Conflicts
Accept Yours/Base --> This would just run Revert and Resolve?
Accept Mine/Local --> This would need to copy the .mine and Resolve?

Or are you suggesting we just have the 3 options be:

Edit Conflict
Mark Resolved

And the user might run Quick Fix multiple times to take the appropriate

It would be nice if Edit Conflicts had a way to let you run Resolve as
part of saving the way that TortoiseMerge does.

> 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).

I wasn't sure about it either, but it does seem to work. The decorators
seemed like the only place we could realistically set the marker, so it
made sense that it be the place that removes it as well. It also handles
the case where the conflict is resolved using an external tool/process
that Eclipse would not capture. Feel free to look at ways to improve it!


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
Received on Wed Mar 9 00:48:34 2005

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