You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "D.J. Heap" <dj...@shadyvale.net> on 2005/05/01 17:26:17 UTC

Re: [PATCH] Revert and svn:needs-lock

Any objections to this little patch, then?

Thanks!

DJ




D.J. Heap wrote:
[snip]
> 
> Yes, sorry.  The problem is that svn_wc_get_prop_diffs does not return 
> any property diffs if it is called with just the file's name and the 
> command was run from a different directory than the file is in.
> 
> Log:
> Fix revert to detect property changes correctly when it is run from
> outside the working copy directory.
> 
> * subversion/libsvn_wc/adm_ops.c
>   (revert_admin_things): Call svn_wc_get_prop_diffs with the full path
>   rather than just the filename in case we are not running from the
>   file's directory.
> 
> 
> ------------------------------------------------------------------------
> 
> Index: subversion/libsvn_wc/adm_ops.c
> ===================================================================
> --- subversion/libsvn_wc/adm_ops.c      (revision 14500)
> +++ subversion/libsvn_wc/adm_ops.c      (working copy)
> @@ -1231,7 +1231,7 @@
> 
>        /* Get the full list of property changes and see if any magic
>           properties were changed. */
> -      SVN_ERR (svn_wc_get_prop_diffs (&propchanges, NULL, name ? name : "",
> +      SVN_ERR (svn_wc_get_prop_diffs (&propchanges, NULL, fullpath,
>                                        adm_access, pool));
> 
>        /* Determine if any of the propchanges are the "magic" ones that
> 

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