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

Re: Unified context diff...(2) WAS: RE: svn commit: rev 1802 - trunk/subversion/libsvn_delta

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-04-30 00:45:35 CEST

"Kirby C. Bohling" <kbohling@birddog.com> writes:
> Essentially anytime diff/diff3 is called, I like a chance to hint at
> how to do the work. If I had to remember to do it each time, I can do
> that too. 98% of the time the defaults are good enough. When I
> realize they aren't, I'll start over and override the defaults. It's
> the 2% case that is a real bear, and normally those are the cases will
> introduce really subtle bugs in my code base because I missed
> something because the conflict markers made it very hard to see the
> changes. It's why I used cvs diff and patch by hand. IMNSHO, if I
> can get diff and patch to do it handily an SCM should allow me to do
> inside of the SCM.
> Granted, this is the part where I should put my code written
> skills where my mouth is and contribute the patch.

:-) See http://subversion.tigris.org/issues/show_bug.cgi?id=647.

We don't invoke patch at all, and we only invoke `diff' for "svn
diff", for which one can already pass arbitrary options.

For your application, diff3 is the issue.

If you can find the parameters you want for diff3, and work out if/how
they will/won't interfere with the parameters we _must_ pass to diff3,
then we can fix this, yeah...


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 30 00:44:21 2002

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.