You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Grigory V. Kareev" <gk...@parallels.com> on 2008/09/09 03:13:40 UTC
Change internal diff default settings
Hello!
How I can change internal diff program default settings?
Didn't find any config vars in ~/.subversion/config or in Subversion book.
I want to add -x --ignore-eol-style permanently. Is it possible?
Thank you.
--
Grigory Kareev
Parallels
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Change internal diff default settings
Posted by Jan Hendrik <li...@gmail.com>.
Concerning Re: Change internal diff default se
Grigory V. Kareev wrote on 11 Sep 2008, 9:50, at least in part:
> Thank you for the reply. Looks like this is the only way.
> But I need this done primarily on Windows in Tortoise/Eclipse clients.
Up to ver. 1.4.8 Tortoise had settings for Diff Viewer / Merge Tool /
Unified Diff Viewer though probably you can't push these settings
to clients in a LAN like SVN's own config.
Jan Hendrik
---------------------------------------
Freedom quote:
"The last mass trials have been a great success.
There are going to be fewer but better Russians."
-- Greta Garbo as Ninotchka in
"Ninotchka" by Ernst Lubitsch, 1939
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Change internal diff default settings
Posted by "Grigory V. Kareev" <gk...@parallels.com>.
On Tue, 9 Sep 2008 01:09:19 -0500
Ryan Schmidt <su...@ryandesign.com> wrote:
> On Sep 8, 2008, at 22:13, Grigory V. Kareev wrote:
>
> > How I can change internal diff program default settings?
> > Didn't find any config vars in ~/.subversion/config or in
> > Subversion book.
> > I want to add -x --ignore-eol-style permanently. Is it possible?
>
> In the ~/.subversion/config file, you can set diff-cmd to your
> desired diff program, but there's no way to send any additional
> parameters to that diff program, besides the parameters that
> Subversion already sends. So the only way I can think of to do this
> is to write a wrapper diff program. For example:
[skip]
Thank you for the reply. Looks like this is the only way.
But I need this done primarily on Windows in Tortoise/Eclipse clients.
Well, may be I should create feature request...
--
Grigory Kareev
Instrumentation Team Developer
Parallels
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Change internal diff default settings
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Sep 8, 2008, at 22:13, Grigory V. Kareev wrote:
> How I can change internal diff program default settings?
> Didn't find any config vars in ~/.subversion/config or in
> Subversion book.
> I want to add -x --ignore-eol-style permanently. Is it possible?
In the ~/.subversion/config file, you can set diff-cmd to your
desired diff program, but there's no way to send any additional
parameters to that diff program, besides the parameters that
Subversion already sends. So the only way I can think of to do this
is to write a wrapper diff program. For example:
In ~/.subversion/config, add this line:
diff-cmd = /usr/local/bin/diffignorewhitespace
The contents of /usr/local/bin/diffignorewhitespace would be:
#!/bin/bash
diff --ignore-space-change "$@"
(Means: prepend "--ignore-space-change" to the parameters Subversion
is already sending -- "man diff" on my system does not show an "--
ignore-eol-style" parameter, but maybe your diff is different or
newer than mine.)
Make sure /usr/local/bin/diffignorewhitespace has been given the
execute bit:
chmod 755 /usr/local/bin/diffignorewhitespace
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org