You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Dan Christian <dc...@google.com> on 2007/09/25 20:01:45 UTC
interactive merge API docs?
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?
-Dan C
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: interactive merge API docs?
Posted by Daniel Rall <dl...@collab.net>.
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 <ep...@pretzelnet.org> wrote:
> > "Dan Christian" <dc...@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.
Re: interactive merge API docs?
Posted by Dan Christian <dc...@google.com>.
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 <ep...@pretzelnet.org> wrote:
> "Dan Christian" <dc...@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
Re: interactive merge API docs?
Posted by Eric Gillespie <ep...@pretzelnet.org>.
"Dan Christian" <dc...@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