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

"Paul Burba" <pburba@collab.net> writes:

> > + if (err && err->apr_err ==
> > SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL)
> > + {
> > + SVN_ERR(svn_cmdline_fprintf(stderr, subpool, "%s\n",
> > + err->message ?
> > err->message :
> > + _("No merge tool
> > found.\n")));
>
> subpool is not initialized.
>
> > + svn_error_clear(err);
> > + b->external_failed = TRUE;
> > + }
> > + else if (err && err->apr_err == SVN_ERR_EXTERNAL_PROGRAM)
> > + {
> > + SVN_ERR(svn_cmdline_fprintf(stderr, subpool, "%s\n",
>
> Ditto.

Oops, I was supposed to change those to pool, like the others.
Thanks for the catch!

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 4 03:06:05 2007