Re: svn commit: rev 1617 - trunk/subversion/libsvn_client

[Greg Stein <gs...@lyra.org>]

On Mon, Apr 01, 2002 at 02:53:45PM -0600, sussman@tigris.org wrote:
>...
> +++ trunk/subversion/libsvn_client/diff.c	Mon Apr  1 14:53:45 2002
>...
> @@ -258,8 +310,33 @@
>    struct merge_cmd_baton *merge_b = baton;
>    apr_pool_t *subpool = svn_pool_create (merge_b->pool);
>    svn_stringbuf_t *path_s = svn_stringbuf_create (path, subpool);
> +  enum svn_node_kind kind;
> +  svn_boolean_t is_wc;
>  
> -  /* ### if directory already exists, this should be a no-op */
> +  SVN_ERR (svn_io_check_path (path, &kind, subpool));
> +  switch (kind)
> +    {
> +    case svn_node_none:
> +      SVN_ERR (svn_client_mkdir (NULL, path_s, NULL, NULL,
> +                                 NULL, NULL, subpool));
> +      SVN_ERR (svn_client_add (path_s, FALSE, NULL, NULL, subpool));
> +      break;
>...
> +    }
>  
>    SVN_ERR (svn_client_mkdir (NULL, path_s, NULL, NULL, NULL, NULL, subpool));
>    SVN_ERR (svn_client_add (path_s, FALSE, NULL, NULL, subpool));

This mkdir/add at the end should probably go away...

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/

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