[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Trunk JavaHL is not building after merge from blame branch

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-08-18 18:27:09 CEST

On 8/18/07, Mark Phippard <markphip@gmail.com> wrote:
> 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?

The attached patch fixes the problem. I am not sure it is really
right though. Should this "merged_path" field even be part of the
structure? If it should, then should it also be passed through to the
Java layer? Right now, I just "swallow" that field in the C++ code.

I suspect it should not be in the struct to begin with.

Mark Phippard

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sat Aug 18 18:24:50 2007

This is an archived mail posted to the Subversion Dev mailing list.