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

Re: svn commit: r25670 - in trunk/subversion: include libsvn_subr libsvn_wc svn tests/cmdline/svntest

From: David Glasser <glasser_at_mit.edu>
Date: 2007-07-06 22:30:30 CEST

On 7/6/07, sussman@tigris.org <sussman@tigris.org> wrote:

> Modified: trunk/subversion/svn/main.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/main.c?pathrev=25670&r1=25669&r2=25670
> ==============================================================================
> --- trunk/subversion/svn/main.c (original)
> +++ trunk/subversion/svn/main.c Fri Jul 6 11:48:53 2007
> @@ -973,6 +973,7 @@
> svn_config_t *cfg;
> svn_boolean_t used_change_arg = FALSE;
> svn_boolean_t descend = TRUE;
> + svn_boolean_t interactive_conflicts = FALSE;
>
> /* Initialize the app. */
> if (svn_cmdline_init("svn", stderr) != EXIT_SUCCESS)
> @@ -1712,8 +1713,24 @@
> ctx->auth_baton = ab;
>
> /* Set up conflict resolution callback. */
> - ctx->conflict_func = svn_cl__ignore_conflicts;
> - ctx->conflict_baton = NULL;
> + if ((err = svn_config_get_bool(cfg, &interactive_conflicts,
> + SVN_CONFIG_SECTION_MISCELLANY,
> + SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS,
> + TRUE))) /* ### interactivity on by default.
> + we can change this. */
> + svn_handle_error2(err, stderr, TRUE, "svn: ");

I think you should use "return svn_cmdline_handle_exit_error" there
instead of svn_handle_error2, which actually abort()s when the third
argument is TRUE (which happens if the user puts a non-boolean value
for "interactive-commits" in their config file)

I guess that goes for the other two uses of svn_handle_error2 with a
TRUE fatal argument in that file as well, both of which can come from
invalid configuration files.

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 6 22:50:42 2007

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