You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/09/21 15:10:39 UTC
svn commit: r999392 - in /subversion/branches/atomic-revprop: ./
subversion/svnsync/main.c
Author: danielsh
Date: Tue Sep 21 13:10:39 2010
New Revision: 999392
URL: http://svn.apache.org/viewvc?rev=999392&view=rev
Log:
On the atomic-revprop branch, merge r999391 from trunk.
Modified:
subversion/branches/atomic-revprop/ (props changed)
subversion/branches/atomic-revprop/subversion/svnsync/main.c
Propchange: subversion/branches/atomic-revprop/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 21 13:10:39 2010
@@ -37,4 +37,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:965046-997404,998880,999158,999375
+/subversion/trunk:965046-997404,998880,999158,999375,999391
Modified: subversion/branches/atomic-revprop/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svnsync/main.c?rev=999392&r1=999391&r2=999392&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svnsync/main.c (original)
+++ subversion/branches/atomic-revprop/subversion/svnsync/main.c Tue Sep 21 13:10:39 2010
@@ -290,7 +290,7 @@ maybe_unlock(svn_ra_session_t *session,
const svn_string_t *mylocktoken,
apr_pool_t *scratch_pool)
{
- const svn_string_t *reposlocktoken;
+ svn_string_t *reposlocktoken;
SVN_ERR(svn_ra_rev_prop(session, 0, SVNSYNC_PROP_LOCK, &reposlocktoken,
scratch_pool));