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...
> Now, should this API be a member of svn_client_ctx_t? If so, I
> believe that I have to rev that data structure.
>
> Otherwise, I can make it a parameter to svn_client_merge3() and
> svn_client_merge_peg3().
Yes, it should go in svn_client_ctx_t, but no you don't need to rev
it, just put it at the end of the structure.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 1 16:26:39 2006