[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-09 17:34:12 CET

Brock Janiczak <brockj_eclipse@ihug.com.au> wrote on 03/09/2005 05:14:53
AM:

> I was suggesting the second one (quick fixes that run either revert,
resolve
> or edit conflicts), but I forgot that SVN automatically merged the
files for you :)
> So, the first first option you suggested would be the way to go. It
might be
> good to have a resolve action too if the user has manually fixed the
errors
> (they can alwyas use the team context menu too).
>
> If you want, i could knock them up on the weekend.

Please do.

> This could be hooked up in ConflictsCompareEditorInput. The problem is
that
> the editor may have to be closed (or closing) when the resolve happens.
I
> will need to try this out...

Ideal would probably be if it asked you when you close the editor if you
want to resolve the conflict.

> We do pick up changes to the .svn files though a resource listener
(requires
> the folders to be refreshed) so it should be possible to catch the new
> conflicted statuses with the notify listener. It might even be possible
to
> hook it into the Sync info...
> If i get a chance, i will look at alternatives, but your scheme does
work, so
> I am not too worried.

I agree that a listener could probably do it as well.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Thu Mar 10 03:34:12 2005

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