[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: overriding .subversion/config[helpers] on the command line

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 10 Oct 2014 10:27:46 +0200

On Fri, Oct 10, 2014 at 12:53:16AM -0700, Perry Hutchison wrote:
> I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
> section of .subversion/config, and they seem to be working properly.
> However, when running "svn merge --dry-run", I sometimes want all
> merge and diff3 attempts to "fail" because I just want the report
> of what files would be updated, without trying to actually merge
> any files and especially without requiring any interaction.
> I would prefer to specify this override on the command line rather
> than having to edit, and subsequently restore, ~/.subversion/config.
> It appears that I can override the diff3-cmd setting by adding
> --diff3-cmd=/bin/false to the command, but when I try to do the
> same thing to merge-tool-cmd (by adding --merge-tool-cmd=/bin/false)
> I get an error message:
> svn: invalid option: --merge-tool-cmd=/bin/false
> How do I go about overriding the merge-tool-cmd setting on the svn
> command line? I found nothing pertinent in the svn 1.6 book, nor in
> the archives.
> svn version 1.6.17 (r1128011) on Ubuntu 12.04, in case it matters.
> Please Cc.

Try --config-option:config:global:merge-tool-cmd=/bin/false
Received on 2014-10-10 10:28:26 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.