config changes, xmldiff (was: Re: CRITICAL Shibboleth Security Advisory 20110725)
Peter Schober
peter.schober at univie.ac.at
Thu Aug 18 22:23:22 BST 2011
* Chad La Joie <lajoie at itumi.biz> [2011-08-18 22:14]:
> One thing you might want to consider now that we have, I think, all
> the MIME types on our files correct is to use that instead of checking
> to see if the file ends in .xml. Just use 'svn propget svn:mime-type
> FILE'.
I thought about this but during `svn diff --diff-cmd` there is no MIME
(or any other propset) information made available to the external diff
command, just a list of obscure arguments assuming the use of GNU
diff/diff3:
"Subversion continues to throw all those GNU utility options at your
external diff tool regardless of whether that program can
understand those options."
http://svnbook.red-bean.com/nightly/en/svn.advanced.externaldifftools.html
E.g.
Index: attribute-resolver.xml
===================================================================
['/path/to/svnxmldiffwrapper', '-u', '-L',
'attribute-resolver.xml\t(.../2.2.1/src/installer/resources/conf-tmpl)\t(revision 3064)',
'-L',
'attribute-resolver.xml\t(.../2.3.0/src/installer/resources/conf-tmpl)\t(revision 3064)',
'/tmp/tempfile.3.tmp', '/tmp/tempfile.4.tmp']
Granted one might fire off an external command to check the mime type
for the file mentioned as the fourth argument. Checking the filename
obviously is a shortcut.
-peter
More information about the users
mailing list