| commit | a78cc29ab3ee1522acc757019a8f96c7e7086642 | [log] [tgz] |
|---|---|---|
| author | Bert Huijben <rhuijben@apache.org> | Wed Aug 17 13:42:11 2011 +0000 |
| committer | Bert Huijben <rhuijben@apache.org> | Wed Aug 17 13:42:11 2011 +0000 |
| tree | 3125f812112cd7e16b136c29cd21d5519e887cd2 | |
| parent | a17e647473d7e825a967e68bb4b13d79374e4632 [diff] |
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. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-JavaHL-pools@1158696 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp index 4d83078..7cc31c2 100644 --- a/subversion/bindings/javahl/native/SVNClient.cpp +++ b/subversion/bindings/javahl/native/SVNClient.cpp
@@ -918,7 +918,7 @@ 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;