[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: Daniel Rall <dlr_at_collab.net>
Date: 2007-09-27 01:16:09 CEST

Issue #2828 is about adding documentation of this new behavior to the
spec. Can you suggest what should be documented?

http://subversion.tigris.org/issues/show_bug.cgi?id=2828

Thanks, Dan

On Tue, 25 Sep 2007, Dan Christian wrote:

> 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.

  • application/pgp-signature attachment: stored
Received on Thu Sep 27 01:16:19 2007

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