[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: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-02-08 23:40:38 CET

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?).

Sticking with the .rej files is fine with me, *especially* if we have
a separate tool that can produce a conflict-markered file, given all
the relevant data (i.e., you invoke the tool on a single wc path, it
knows how to find text-base, rej file, etc).


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.