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

Re: svn commit: r23881 - branches/merge-tracking/subversion/include

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2007-03-16 21:11:03 CET

dlr@tigris.org wrote:
> Author: dlr
> Date: Fri Mar 16 11:53:21 2007
> New Revision: 23881
>
> Log:
> On the merge-tracking branch: Move delcaration of the merge conflict
> resolution API down with other merging APIs.
...

I get a compile-time error after this change. It appears that
svn_client_ctx_t is using svn_client_conflict_resolver_func_t in line
819, but svn_client_conflict_resolver_func_t is now not declared until
line 2036.

-Hyrum

Received on Fri Mar 16 21:11:23 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.