Author: stsp
Date: Fri Sep 18 16:16:20 2015
New Revision: 1703898
URL: http://svn.apache.org/viewvc?rev=1703898&view=rev
Log:
* subversion/svn/resolve-cmd.c
(svn_cl__resolve): Restore assignment to variable 'err' lost in r1703892.
Modified:
subversion/trunk/subversion/svn/resolve-cmd.c
Modified: subversion/trunk/subversion/svn/resolve-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolve-cmd.c?rev=1703898&r1=1703897&r2=1703898&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Fri Sep 18 16:16:20 2015
@@ -390,15 +390,15 @@ svn_cl__resolve(apr_getopt_t *os,
SVN_ERR(svn_client_conflict_get(&conflict, local_abspath, ctx,
iterpool, iterpool));
- SVN_ERR(svn_cl__resolve_conflict(&resolved,
- &opt_state->accept_which,
- &quit, &external_failed,
- &printed_summary,
- conflict, opt_state->editor_cmd,
- ctx->config, path_prefix,
- pb, conflict_stats,
- option_id, ctx,
- iterpool));
+ err = svn_cl__resolve_conflict(&resolved,
+ &opt_state->accept_which,
+ &quit, &external_failed,
+ &printed_summary,
+ conflict, opt_state->editor_cmd,
+ ctx->config, path_prefix,
+ pb, conflict_stats,
+ option_id, ctx,
+ iterpool);
}
else
{
