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

Re: svnlook diff fails on binary files:

From: Blair Zajac <blair_at_orcaware.com>
Date: 2002-11-09 20:47:15 CET

Philip Martin wrote:
> Changing Subversion to avoid running diff on binary files will solve
> most problems, leaving only the case where Subversion classifies a
> file as text and diff classifies it as binary. However such a case
> will probably cause problems when attempting a three-way merge during
> update, so the user is advised to make sure Subversion's file
> classification matches that of diff.

If we're going to do this, then maybe we should design in a more
general diff scheme, where you can specify different diff programs
for different mime-types.

So you could have an xmldiff for XML files, etc.

Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Nov 9 20:47:40 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.