subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1102917 - in /subversion/trunk/subversion: libsvn_client/prop_commands.c libsvn_wc/wc.h
Date Fri, 13 May 2011 23:00:46 GMT
Author: rhuijben
Date: Fri May 13 23:00:46 2011
New Revision: 1102917

URL: http://svn.apache.org/viewvc?rev=1102917&view=rev
Log:
* subversion/libsvn_client/prop_commands.c
  (svn_client_propget3): Following up on r1102915, use the right key in the
    hashtable.
  (remote_proplist): Catch error leak.

Modified:
    subversion/trunk/subversion/libsvn_client/prop_commands.c
    subversion/trunk/subversion/libsvn_wc/wc.h

Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=1102917&r1=1102916&r2=1102917&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Fri May 13 23:00:46 2011
@@ -946,10 +946,13 @@ svn_client_propget3(apr_hash_t **props,
             if (!err)
               {
                 if (node_props)
-                  apr_hash_set(*props, propname, APR_HASH_KEY_STRING,
+                  apr_hash_set(*props, path_or_url, APR_HASH_KEY_STRING,
                                apr_hash_get(node_props, propname,
                                             APR_HASH_KEY_STRING));
 
+                if (actual_revnum)
+                  *actual_revnum = SVN_INVALID_REVNUM; /* Unrelated */
+
                 return SVN_NO_ERROR;
               }
             else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
@@ -1125,7 +1128,8 @@ remote_proplist(const char *target_prefi
         }
     }
 
-  call_receiver(target_full_url, final_hash, receiver, receiver_baton, pool);
+  SVN_ERR(call_receiver(target_full_url, final_hash, receiver, receiver_baton,
+                        pool));
 
   if (depth > svn_depth_empty
       && (kind == svn_node_dir) && (apr_hash_count(dirents) > 0))

Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1102917&r1=1102916&r2=1102917&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Fri May 13 23:00:46 2011
@@ -153,7 +153,7 @@ extern "C" {
  * Please document any further format changes here.
  */
 
-#define SVN_WC__VERSION 28
+#define SVN_WC__VERSION 29
 
 
 /* Formats <= this have no concept of "revert text-base/props".  */



Mime
View raw message