Re: svn diff fix for bug 2044
From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Wed, 20 Mar 2013 19:58:57 +0000
Thanks for all the feedback, advice and ideas so far :)
IIRC Subversion needs to communicate the following file names to the
mine, yours, base and output
It then takes the user input (--diff-cmd) from either the command line
All we need to do is to render the command line *exactly* as typed
A simple case:
-diff-cmd=%%/usr/fancy_diff_cmd %mine %yours %base %output%%
or more complex:
-diff-cmd=%%/usr/fancy_diff_cmd -x "" -L ' ' %mine -Q %yours -Z %base -q
The reason for the un-unix-like "%" syntax is that we don't want to
Also, the %% delimiter keeps it visually simple for the user as well
What do you think?
This is an archived mail posted to the Subversion Dev mailing list.