You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/08/17 15:42:11 UTC
svn commit: r1158696 -
/subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp
Author: rhuijben
Date: Wed Aug 17 13:42:11 2011
New Revision: 1158696
URL: http://svn.apache.org/viewvc?rev=1158696&view=rev
Log:
On the 1.7.x-JavaHL-pools branch: Properly resolve the merge conflict that
made me create a branch.
Found by: markphip
* subversion/bindings/javahl/native/SVNClient.cpp
(propertySetRemote): Provide the log message instead of NULL.
Modified:
subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp
Modified: subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp?rev=1158696&r1=1158695&r2=1158696&view=diff
==============================================================================
--- subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/1.7.x-JavaHL-pools/subversion/bindings/javahl/native/SVNClient.cpp Wed Aug 17 13:42:11 2011
@@ -918,7 +918,7 @@ void SVNClient::propertySetRemote(const
Path intPath(path, subPool);
SVN_JNI_ERR(intPath.error_occured(), );
- svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
+ svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
return;