Author: rhuijben
Date: Thu Apr 21 22:42:39 2011
New Revision: 1095839
URL: http://svn.apache.org/viewvc?rev=1095839&view=rev
Log:
* subversion/bindings/javahl/native/CreateJ.cpp
(CreateJ::Status): Use svn_wc_conflicted_p3 instead of the old private api.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1095839&r1=1095838&r2=1095839&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Thu Apr 21
22:42:39 2011
@@ -519,10 +519,11 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
svn_boolean_t prop_conflicted = FALSE;
svn_boolean_t tree_conflicted = FALSE;
- SVN_JNI_ERR(svn_wc__node_check_conflicts(&prop_conflicted,
- &text_conflicted,
- &tree_conflicted, wc_ctx,
- local_abspath, pool, pool),
+ SVN_JNI_ERR(svn_wc_conflicted_p3(&text_conflicted,
+ &prop_conflicted,
+ &tree_conflicted,
+ wc_ctx, local_abspath,
+ pool),
NULL);
if (tree_conflicted)
