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

Re: interactive merge API docs?

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2007-09-25 22:10:32 CEST

"Dan Christian" <dchristian@google.com> writes:

> I can't seem to find any documentation on how to use the new
> interactive merge calls. Nothing shows up in doxygen from trunk (make
> doc-api).
>
> Are there docs somewhere?

Search for "conflict handling" in svn_wc.h. Looks like you
register a svn_wc_conflict_resolver_func_t and return something
like svn_wc_conflict_result_conflicted.

-- 
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 25 22:10:49 2007

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