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

[PATCH] svnsync --config-dir ignored

From: Peter Lloyd <l-svndev_at_pgl22.co.uk>
Date: 2007-10-10 00:21:31 CEST

Hi,

I have a "config" file with a definition for a custom tunnel agent.
Using 1.4.5 (also reproducible with trunk), I can get svnsync to work when
this definition is in ~/.subversion/config, but not when it's in a
config file in another directory, specified with --config-dir.

When using --config-dir (and not having defined the agent in
/.subversion/config), I get the error:
'svnsync: Undefined tunnel scheme 'xxxx''

The below patch appears to fix this for me. Does it look sensible?
I have not investigated whether other parts of the config file were being
read or not.

Thanks,
Peter

[[[

svnsync: When --config-dir was used, tunnel agents in the specified
config file were ignored. Now fixed.

* subversion/svnsync/main.c
    (main): pass config_dir to svn_config_get_config

]]]

Index: subversion/svnsync/main.c
===================================================================
--- subversion/svnsync/main.c (revision 27055)
+++ subversion/svnsync/main.c (working copy)
@@ -1669,7 +1669,7 @@
           }
       }

- err = svn_config_get_config(&opt_baton.config, NULL, pool);
+ err = svn_config_get_config(&opt_baton.config, opt_baton.config_dir, pool);
     if (err)
       return svn_cmdline_handle_exit_error(err, pool, "svnsync: ");

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 10 00:22:05 2007

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