Author: philip
Date: Fri Nov 25 10:07:33 2011
New Revision: 1206109
URL: http://svn.apache.org/viewvc?rev=1206109&view=rev
Log:
On the moves-scan-log branch.
* subversion/svn/main.c
(main): Avoid SVN_ERR in main.
Modified:
subversion/branches/moves-scan-log/subversion/svn/main.c
Modified: subversion/branches/moves-scan-log/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/svn/main.c?rev=1206109&r1=1206108&r2=1206109&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/svn/main.c (original)
+++ subversion/branches/moves-scan-log/subversion/svn/main.c Fri Nov 25
10:07:33 2011
@@ -2626,12 +2626,12 @@ main(int argc, const char *argv[])
ctx->conflict_func = NULL;
ctx->conflict_baton = NULL;
ctx->conflict_func2 = svn_cl__conflict_handler;
- SVN_ERR(svn_cl__conflict_baton_make(&ctx->conflict_baton2,
- opt_state.accept_which,
- ctx->config,
- opt_state.editor_cmd,
- pb,
- pool));
+ SVN_INT_ERR(svn_cl__conflict_baton_make(&ctx->conflict_baton2,
+ opt_state.accept_which,
+ ctx->config,
+ opt_state.editor_cmd,
+ pb,
+ pool));
}
/* And now we finally run the subcommand. */
