Re: interactive merge API docs?

Thanks.

I was searching for "interactive merge", when what I really wanted was:
svn_wc_conflict_resolver_func_t and svn_wc_conflict_description_t.

-Dan C

On 9/25/07, Eric Gillespie <epg@pretzelnet.org> wrote:
> "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:47:11 2007