svn commit: r999517 - /subversion/branches/atomic-revprop/subversion/svnsync/main.c

[da...@apache.org]

Author: danielsh
Date: Tue Sep 21 17:44:49 2010
New Revision: 999517

URL: http://svn.apache.org/viewvc?rev=999517&view=rev
Log:
On the atomic-revprops branch:

Upgrade an API call.

* subversion/svnsync/main.c
  (maybe_unlock):
    Call svn_ra_change_rev_prop2() instead of svn_ra_change_rev_prop().

Modified:
    subversion/branches/atomic-revprop/subversion/svnsync/main.c

Modified: subversion/branches/atomic-revprop/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svnsync/main.c?rev=999517&r1=999516&r2=999517&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svnsync/main.c (original)
+++ subversion/branches/atomic-revprop/subversion/svnsync/main.c Tue Sep 21 17:44:49 2010
@@ -299,12 +299,18 @@ maybe_unlock(svn_ra_session_t *session,
              apr_pool_t *scratch_pool)
 {
   svn_string_t *reposlocktoken;
+  svn_boolean_t be_atomic;
+
+  SVN_ERR(svn_ra_has_capability(session, &be_atomic,
+                                SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
+                                scratch_pool));
 
   SVN_ERR(svn_ra_rev_prop(session, 0, SVNSYNC_PROP_LOCK, &reposlocktoken,
                           scratch_pool));
   if (reposlocktoken && strcmp(reposlocktoken->data, mylocktoken->data) == 0)
-    SVN_ERR(svn_ra_change_rev_prop(session, 0, SVNSYNC_PROP_LOCK, NULL,
-                                   scratch_pool));
+    SVN_ERR(svn_ra_change_rev_prop2(session, 0, SVNSYNC_PROP_LOCK, 
+                                    be_atomic ? &mylocktoken : NULL, NULL,
+                                    scratch_pool));
 
   return SVN_NO_ERROR;
 }