Log Message:
Fix Issue #2030: Allow 'svn propset' to skip unversioned files and
continue.
* subversion/clients/cmdline/propset-cmd.c
(svn_cl__propset) : If error is SVN_ERR_UNVERSIONED_RESOURCE
continue after printing warning message to stderr.
Index: subversion/clients/cmdline/propset-cmd.c
===================================================================
--- subversion/clients/cmdline/propset-cmd.c (revision 10785)
+++ subversion/clients/cmdline/propset-cmd.c (working copy)
@@ -53,6 +53,7 @@
svn_boolean_t propval_came_from_cmdline;
apr_array_header_t *args, *targets;
int i;
+ svn_error_t *err;
/* PNAME and PROPVAL expected as first 2 arguments if filedata was
NULL, else PNAME alone will precede the targets. Get a UTF-8
@@ -186,8 +187,18 @@
svn_pool_clear (subpool);
SVN_ERR (svn_cl__check_cancel (ctx->cancel_baton));
- SVN_ERR (svn_client_propset (pname_utf8, propval, target,
- opt_state->recursive, subpool));
+ err = svn_client_propset (pname_utf8, propval, target,
+ opt_state->recursive, subpool);
+ if (err)
+ {
+ if (err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE)
+ {
+ svn_handle_warning (stderr, err);
+ svn_error_clear(err);
+ }
+ else
+ return err;
+ }
if (! opt_state->quiet)
"2030.mail" 43L, 1515C
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 31 14:59:05 2004