You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/02 15:45:20 UTC
svn commit: r1098564 -
/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
Author: hwright
Date: Mon May 2 13:45:20 2011
New Revision: 1098564
URL: http://svn.apache.org/viewvc?rev=1098564&view=rev
Log:
* subversion/bindings/javahl/native/ClientContext.cpp:
Revert bits accidentally committed in r1098563.
Modified:
subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1098564&r1=1098563&r2=1098564&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Mon May 2 13:45:20 2011
@@ -87,8 +87,8 @@ ClientContext::ClientContext(jobject jsv
persistentCtx->notify_baton2 = m_jctx;
persistentCtx->progress_func = progress;
persistentCtx->progress_baton = m_jctx;
- persistentCtx->conflict_func2 = resolve;
- persistentCtx->conflict_baton2 = m_jctx;
+ persistentCtx->conflict_func = resolve;
+ persistentCtx->conflict_baton = m_jctx;
}
ClientContext::~ClientContext()
@@ -348,7 +348,7 @@ ClientContext::progress(apr_off_t progre
svn_error_t *
ClientContext::resolve(svn_wc_conflict_result_t **result,
- const svn_wc_conflict_description2_t *desc,
+ const svn_wc_conflict_description_t *desc,
void *baton,
apr_pool_t *pool)
{