[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: D.J. Heap <dj_at_shadyvale.net>
Date: 2005-04-29 00:52:25 CEST

kfogel@collab.net wrote:
> "D.J. Heap" <dj@shadyvale.net> writes:
>
>>This appears to be a simple fix, patch attached.
>
>
> Thanks!
>
> This can be reviewed without a log message, but in the future would
> you mind posting with a log message, as per HACKING? Especially, your
> post should include a description of the bug, so people don't have to
> go chasing down the rest of the mail thread in order to evaluate the
> patch.
>
> I don't have time to review/test this now, but I will try to tomorrow.
> If you get a chance to repost before then, that would help a bit, but
> it's not a big deal.
>
> -Karl

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
Received on Fri Apr 29 00:53:47 2005

This is an archived mail posted to the Subversion Dev mailing list.