[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: Daniel Rall <dlr_at_collab.net>
Date: 2006-11-01 02:13:35 CET

On Tue, 31 Oct 2006, Daniel Rall 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).
> Now, should this API be a member of svn_client_ctx_t? If so, I
> believe that I have to rev that data structure.

svn_client_create_context() handles any compatibility concerns for
svn_client_ctx_t -- the structure definition does not need to be

> Otherwise, I can make it a parameter to svn_client_merge3() and
> svn_client_merge_peg3().

  • application/pgp-signature attachment: stored
Received on Wed Nov 1 02:10:47 2006

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