> Sjoerd Tieleman <Sjoerd.Tieleman@phil.uu.nl> writes:
>>A quick search gives me some discussion from around July 2004:
>>[ custom diff tools, a question is asked whether one can select a diff
>>tool based on the svn:mime-type property ]
>>Yes, of course. The "diff tool" could be a script that looks at the SVN
>>file properties in the working copy (via "svn propget svn:mime-type,"
>>for example). However, note that this would work when explicitly calling
>>invoking "svn diff". It would _not_ magically make Subversion merge
>>differences in binary files using your tool during "svn update", because
>>Subversion's notion of when a file is binary is hard-coded, and if it
>>thinks a file is binary, it won't invoke diff3 to do the merge.
>>So, this is kind of a bummer, because as I understand, Subversion sees
>>everything not marked as "text/*" as a binary file, and as such diff
>>tools are not called.
> Yes, absolutely, this is a real problem.
> There was a huge discussion here recently about the right way to fix
> this, but after crawling around the archives for twenty minutes, I
> still can't find it :-(. I must be searching on the wrong keywords;
> does anyone remember the thread?
These are about calling generic "diff" programs but not about doing so on
2003-06-28 "help setting up Visual Diff"
2003-08-08 "Using an external diff program with Subversion"
(Thread crosses over from "users" to "dev" list.)
This is about calling an external diff3 for non-text files:
2005-07-11 "--diff3-cmd for binary files"
These just discuss the status quo (no solutions):
2004-02-26 "visual diff"
2004-10-03 "--diff-cmd arguments"
These proposed to add a separate config option for the diff arguments:
2003-06-30 "[PATCH] allow for default diff -x opts in config file"
2005-08-11 "[PATCH] add diff-cmd-args option to [helper] section."
> a) filing this as an issue (we don't seem to have one)
Issue #2044: "Fully customizable external diff invocations"
This is about the arguments passed to the diff, and it would be a good idea
to tweak its summary to be explicitly about the arguments.
Issue #2447: "Support for external diff commands for non-text types"
This is the one Sjoerd has just filed, about diffing non-text files, and
preferably using different programs for different file types.
> b) tracking down those mail threads and linking to them from the issue
I've just added the most relevant links.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Tue Nov 22 15:12:38 2005