[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: Alexander Kitaev <alex_at_tmate.org>
Date: 2006-01-30 15:40:25 CET

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.

Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/

> -----Original Message-----
> From: Mark Phippard [mailto:markp@softlanding.com]
> Sent: Monday, January 30, 2006 5:26 PM
> To: dev@subclipse.tigris.org
> Subject: Re: [Subclipse-dev] [PATCH] Delete unmanaged
> resources/Filter conflicts
>
> Paul Lorenz <plorenz@gmail.com> wrote on 01/29/2006 11:40:15 PM:
>
> > 1. Adds a preferences option to delete unmanaged resources on
> > revert/replace. So if you revert an add, it will be deleted after
> > reverting (to match the repository state).
>
> I have not applied this yet, but I do not think a preference
> is appropriate for this. It seems like it needs to be a
> visible option on the dialogs. Perhaps a preference could
> define the default state of the option on the dialog, but it
> seems like you need to let the user decide this on a case by
> case basis. I am not that crazy about this even being an
> option, but if it is, I think you need to let the user
> control it on each action.
>
> > 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.
>
> This sounds cool, I look forward to looking at it.
>
> Mark
>
> ______________________________________________________________
> _______________
> Scanned for SoftLanding Systems, Inc. and SoftLanding Europe
> Plc by IBM Email Security Management Services powered by MessageLabs.
> ______________________________________________________________
> _______________
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: dev-help@subclipse.tigris.org
>
>

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

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