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

Re: Patch command execution

From: Roman Neuhauser <neuhauser_at_mobil.cz>
Date: 2002-02-09 14:21:43 CET

> To: Branko Čibej <brane@xbc.nu>
> Cc: dev@subversion.tigris.org
> From: Karl Fogel <kfogel@newton.ch.collab.net>
> Date: 08 Feb 2002 16:40:38 -0600
> Subject: Re: Patch command execution
> Branko Čibej <brane@xbc.nu> writes:
> > This is obviously a case where we'll never get consensus on the colour
> > of the bikeshed. Therefore it must be configurable. I'd go with Zack's
> > suggestion that we always expect to do a 3-way merge. The prerequisite
> > for that is that we have all three (original, local and reporitory)
> > versions of the file available, /which we already do/. Those three
> > files can passed on to a client-side merger.
> Actually, now that I see how many people really dislike CVS's conflict
> markers, I'm ready to withdraw the idea of supporting them directly
> (was anyone else as virulently in favor as I was?).

    I like the conflict markers.
    If it's a matter of "up --conflicts-as-markers" in .svnrc, I'm fine.

2:18PM up 19 days, 20:41, 17 users, load averages: 0.00, 0.02, 0.00
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.