You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Sander Striker <st...@apache.org> on 2003/02/16 21:16:38 UTC
RE: svn diff uses internal diff!
> From: Philip Martin
> Sent: Sunday, February 16, 2003 2:32 PM
[...]
> I have no problem with the internal diff/merge being enabled as the
> default right now, but until we have more regression tests I think we
> should provide an option to allow a paranoid user to disable use of
> the internal library and fall back on the external programs.
I've enabled it now. Paranoid users can disable it by setting diff3-cmd
in .subversion/config. I was hoping that I also had the --diff3-cmd
on the commandline covered, but Garrett told me otherwise. It seems that
the config hash is not passed through libsvn_wc/log.c. Internally it
creates a new config hash and passes that to svn_wc_merge, discarding the
overrides.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff uses internal diff!
Posted by Branko Čibej <br...@xbc.nu>.
Sander Striker wrote:
>>From: Philip Martin
>>Sent: Sunday, February 16, 2003 2:32 PM
>>
>>
>
>[...]
>
>
>>I have no problem with the internal diff/merge being enabled as the
>>default right now, but until we have more regression tests I think we
>>should provide an option to allow a paranoid user to disable use of
>>the internal library and fall back on the external programs.
>>
>>
>
>I've enabled it now. Paranoid users can disable it by setting diff3-cmd
>in .subversion/config. I was hoping that I also had the --diff3-cmd
>on the commandline covered, but Garrett told me otherwise. It seems that
>the config hash is not passed through libsvn_wc/log.c. Internally it
>creates a new config hash and passes that to svn_wc_merge, discarding the
>overrides.
>
>
The regression tests on Windows pass (yes, I did remember to coment out
the diff settings in the config file).
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff uses internal diff!
Posted by Philip Martin <ph...@codematters.co.uk>.
"Sander Striker" <st...@apache.org> writes:
> I was hoping that I also had the --diff3-cmd on the commandline
> covered, but Garrett told me otherwise.
I think it would be a good idea to tweak the log message for r4910 to
reflect this.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org