Trunk JavaHL is not building after merge from blame branch

I get this error:

/Users/mphippard/work/svn-trunk/subversion/bindings/javahl/native/SVNClient.cpp:1419:
error: initializing argument 8 of 'svn_error_t*
svn_client_blame4(const char*, const svn_opt_revision_t*, const
svn_opt_revision_t*, const svn_opt_revision_t*, const
svn_diff_file_options_t*, svn_boolean_t, svn_boolean_t, svn_error_t*
(*)(void*, apr_int64_t, svn_revnum_t, const char*, const char*,
svn_revnum_t, const char*, const char*, const char*, const char*,
apr_pool_t*), void*, svn_client_ctx_t*, apr_pool_t*)'

Also, Hyrum, I thought you were going to make BlameCallbackImpl
implement both the old and new interface?

Finally, in the new interface, which fields have the info from the
"original" change? I assume the field names with "merged" in them
contain the info from when the line was merged, and the other fields
from when it originated?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org