Re: patch to libsvn_client/export.c

plasma <plasmaball@pchome.com.tw> writes:

> LOG:
>
> Issue #1296. Add a new --force option to 'svn export'.

Please read the HACKING file or run
 'svn log http://svn.collab.net/repos/svn'
to see the preferred format for log messages,

> --- subversion/libsvn_client/export.c.orig Sat May 10 09:05:54 2003
> +++ subversion/libsvn_client/export.c Sun May 18 14:00:09 2003
[...]
> @@ -305,11 +307,22 @@
> svn_node_kind_t kind;
>
> SVN_ERR (svn_io_check_path (eb->root_path, &kind, pool));
> - if (kind != svn_node_none)
> - return svn_error_create (SVN_ERR_WC_OBSTRUCTED_UPDATE,
> - NULL, eb->root_path);
> + if (eb->force)
> + {
> + if (kind == svn_node_none)
> + SVN_ERR (svn_io_dir_make (eb->root_path, APR_OS_DEFAULT, pool));
> + else if (kind == svn_node_file)
> + return svn_error_create (SVN_ERR_WC_OBSTRUCTED_UPDATE,
> + NULL, eb->root_path);
> + }
> + else
> + {
> + if (kind != svn_node_none)
> + return svn_error_create (SVN_ERR_WC_OBSTRUCTED_UPDATE,
> + NULL, eb->root_path);
> + SVN_ERR (svn_io_dir_make (eb->root_path, APR_OS_DEFAULT, pool));
> + }

Too much code, I'd prefer something like

     if (kind == svn_node_none)
       SVN_ERR (svn_io_dir_make ( ... ));
     else if (! (kind == svn_node_dir && force))
       return svn_error_create ( ... );

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org