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

Re: Decorator for SVN Conflict

From: Panagiotis Korros <panagiotis.korros_at_gmail.com>
Date: 2005-03-05 11:18:57 CET

I also prefer the merge conflict icon. Maybe we should change the
colors of the icon to red to to show the actual importance.

On Sat, 05 Mar 2005 08:59:21 +1000, Brock Janiczak
<brockj_eclipse@ihug.com.au> wrote:
> Mark Phippard wrote:
>
> >Currently, we are using the same icon for a Subversion conflict that is
> >used by the Synch view for a conflict. Since these are not the same
> >thing, this is probably not a good idea. So I think we should use a new
> >icon for the Subversion conflicts. I am open to suggestions but I have
> >two proposals attached.
> >
> >I think the best option is the warning icon. If you look at the current
> >icons we provide for Edit Conflict and Mark Resolved, they both involve
> >this icon, so it is natural fit. The only real negative is that is the
> >same decorator that JDT and many other tools use for their warnings. So
> >you can get decorator overload of seeing the same decorator.
> >
> >The other option is the one that CVS provides. Their help says it is for
> >a merge conflict, but makes it sound like you would rarely if ever see it.
> > It also is not very distinctive and doesn't convey any sense of urgency
> >that the icon probably ought to be conveying.
> >
> >So I vote for the warning icon, but will wait to hear what you think.
> >
> >Mark
> >
> >
>
> I prefer the merge conflict icon (the stange grey blob). The main
> reason for not going with the warnign icon is because it would look
> quite odd to have the same overlay twice in the same image. That, and i
> have trained myself to ignore the warning icons in some projects :)
> If JDT didn't put warning overlays on the files i would have gone for
> the warning one.
>
> Either way, i don't really care since i tend to make sure i am up to
> date before updating and manually merge any changes required.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
> For additional commands, e-mail: dev-help@subclipse.tigris.org
>
>

-- 
Take back the web http://www.getfirefox.com
Received on Sat Mar 5 21:18:57 2005

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