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

Re: First impressions...

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-01-28 17:45:48 CET

Karl Fogel <kfogel@newton.ch.collab.net> writes:
> We're not doing content-sensitive diffing in Subversion, except for
> the obvious text-files-get-patched, binary-files-don't thing. There
> are no plans to add it.

Sorry, I should clarify: we will invoke client-specified merge
programs based on MIME-type. But that's in the future, and Subversion
itself can only natively merge in changes based on a simple
binary-vs-text distinction.

-K

---------------------------------------------------------------------
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:00 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.