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

Re: [merge tracking] Merge conflict resolution callback API

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-11-02 05:53:10 CET

On Wed, 01 Nov 2006 20:56:10 +0530, Garrett Rooney
<rooneg@electricjellyfish.net> wrote:

> On 10/31/06, Daniel Rall <dlr@collab.net> wrote:
> For smoother merging on the merge-tracking branch, I'll be adding a
> conflict resolution callback to the client API. This callback will be
> used by svn_client_merge3() when a merge into an already-conflicted
> file is encountered (eventually, I'll try to use it to whenever a
> conflict occurs so that it can be resolved on-the-spot). Right now,
> the API looks like this:
> typedef svn_error_t *(*svn_client_conflict_resolver_func_t)
> (const char *path,
> void *baton,
> apr_pool_t *pool);
> Alternately, this API could return some sort of status indicating the
> state of PATH after its resolution attempt, which could help keep the
> code to actually perform the 'resolve' operation for a conflicted path
> inside Subversion's core (instead of duplicated across client
> implementations).
> Are you planning on putting the user into an interactive merge type
> situation? I wonder how that might interact with RA layers that are
> still pulling down merge operations from the network...

Good Idea. But I share the above concern with Garrett.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 2 05:23:47 2006

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