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

Re: conflict marker bikeshed

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2002-03-12 21:44:59 CET

On Tue, Mar 12, 2002 at 02:45:28PM -0600, Karl Fogel wrote:
> Ben Collins-Sussman <sussman@collab.net> writes:
> > I personally like the 3-part markers, but Karl likes the 2-part ones.
> > But guess what? This is a preference that a user ought to be able to
> > configure in the ~/.subversion/ area. I think I'll file an issue on
> > this. :-)
>
> You know, I think I prefer the 3-part too. Does anyone strongly
> prefer the other way? If not, perhaps we should wait on making this
> configurable, and just default to 3-part conflict regions...

+1 on going with 3 part conflict regions, -0 on making it configurable
at this time. if there's a lot of outcry we can certainly make it
configurable later, but in general, i feel it's better to pick a good
behavior and go with it than it is to have a lot of little tunable
knobs.

-garrett

-- 
garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 12 21:45:40 2002

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