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

Re: [Subclipse-dev] [PATCH] Delete unmanaged resources/Filter conflicts

From: Paul Lorenz <plorenz_at_gmail.com>
Date: 2006-01-30 16:06:27 CET

On 1/30/06, Alexander Kitaev <alex@tmate.org> wrote:
> Hello,
>
> > > 2. Add a filter to the packages view to only show files with
> > > conflicts. Makes it easy(er) to find files you need to look
> > at after a
> > > merge. Adds dependency on some jdt plugins. Also depends on the
> > > warnings stuff. It works by checking if there is a svn
> > conflict merge
> > > marker for the resource.
> I would suggest making this dependency optional, otherwise Subclipse will
> only be limited to Eclipse IDE, and will not work with tools that are built
> on top of Eclipse Platform but does not include JDT plugins.
>
> I'm using "Problems" view for the same purpose - it allows to set up a
> filter that only will show "SVN Conflict" kind of problems and also provides
> a "quick fix" actions to edit conflicts, mark file as resolved or get remote
> or local version of the file instead of merging.
>

I was worried about that. I hadn't realized there was a Optional
checkbox on the dependencies.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: dev-help@subclipse.tigris.org
Received on Mon Jan 30 16:07:07 2006

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