[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: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2007-08-18 20:29:38 CEST

Hash: SHA1

Mark Phippard 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*)'

Yup, remembered that change to the client interface this morning. As of
r26162 (hey, that's a palindrome!), JavaHL now compiles for me. This is
a single test failure, but it appears unrelated to my changes to blame.

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

I remember talking about that, but now it makes sense to have
BlameCallbackImpl just implement the BlameCallback2 interface. Both of
them are new with 1.5, so it doesn't make much sense to have
BlameCallbackImpl implement a now obsolete interface when it doesn't
have any compatibility needs.

> 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 doc string in BlameCallback2 has been updated to reflect which
arguments represent the merged revisions, and which ones are the
original revisions. Does that help with the confusion?

- -Hyrum
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 18 20:27:21 2007

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