Author: rhuijben
Date: Sun Apr 17 19:09:58 2011
New Revision: 1094185
URL: http://svn.apache.org/viewvc?rev=1094185&view=rev
Log:
* subversion/bindings/javahl/native/CreateJ.cpp
(CreateJ::Status): Following up on r1094183, update caller.
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=1094185&r1=1094184&r2=1094185&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Sun Apr 17
19:09:58 2011
@@ -617,13 +617,13 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
/* This call returns SVN_ERR_ENTRY_NOT_FOUND for some hidden
cases, which we can just ignore here as hidden nodes
are not in text or property conflict. */
- svn_error_t *err = svn_wc__node_get_info_bits(NULL,
- &conflict_old,
- &conflict_new,
- &conflict_wrk,
- NULL,
- wc_ctx, local_abspath,
- pool, pool);
+ svn_error_t *err = svn_wc__node_get_conflict_info(&conflict_old,
+ &conflict_new,
+ &conflict_wrk,
+ NULL,
+ wc_ctx,
+ local_abspath,
+ pool, pool);
if (err)
{
