Author: julianfoad
Date: Tue Feb 24 11:44:18 2015
New Revision: 1661894
URL: http://svn.apache.org/r1661894
Log:
On the 'move-tracking-2' branch: In interactive mode, trap more errors.
* subversion/svnmover/svnmover.c
(sub_main): In interactive mode, also trap argument conversion errors.
Modified:
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1661894&r1=1661893&r2=1661894&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Tue Feb
24 11:44:18 2015
@@ -2248,14 +2248,13 @@ sub_main(int *exit_code, int argc, const
{
/* Parse arguments -- converting local style to internal style,
* repos-relative URLs to regular URLs, etc. */
- SVN_ERR(svn_client_args_to_target_array2(&action_args, opts, action_args,
- ctx, FALSE, pool));
-
- if ((err = parse_actions(&actions,
- action_args,
- pool))
- || (err = execute(actions, anchor_url, revprops,
- base_revision, ctx, pool)))
+ err = svn_client_args_to_target_array2(&action_args, opts, action_args,
+ ctx, FALSE, pool);
+ if (! err)
+ err = parse_actions(&actions, action_args, pool);
+ if (! err)
+ err = execute(actions, anchor_url, revprops, base_revision, ctx, pool);
+ if (err)
{
if (err->apr_err == SVN_ERR_AUTHN_FAILED && non_interactive)
err = svn_error_quick_wrap(err,
