[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: <cmpilato_at_collab.net>
Date: 2002-02-09 01:24:58 CET

Karl Fogel <kfogel@newton.ch.collab.net> writes:

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

Oh, I am most certainly a strong supporter of the CVS conflict
markers, but...

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

...if I can get them this way, I'll never complain! I do rather hope
that this functionality is internal to svn, though, not just some
Other Little Binary that I have to keep track of.

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.