[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-13 01:58:14 CET

On Tue, Mar 12, 2002 at 07:05:15PM -0600, Karl Fogel wrote:
> Jens Askengren <jensus@linux.nu> writes:
> > What about compability with editors?
> > Keeping the original CVS style as default would probably be a sane
> > choice.
> Could you explain in more detail?
> I'm normally very conservative and loath to part ways with CVS on
> things like this; in this instance, I'm guessing that the full 3-way
> (-A as opposed to -E) output might be more useable. I have no direct
> experience with it, so it's just a guess.
> If it breaks compatibility with some existing tools, though, that's a
> pretty powerful argument in favor of -E...

i suspect that most tools that work with cvs will need considerable
changes to work with svn anyway, so one more change, if it gives the
user more information and thus makes merging easier, doesn't seem like
a very big deal.


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 Wed Mar 13 01:58:45 2002

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