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

Re: conflict resolver callback question / enhancement request

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-10-12 21:45:02 CEST

On 10/12/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 10/12/07, Erik Huelsmann <ehuels@gmail.com> wrote:
>
> > Actually, it *is* a trivial thing to add, since I added an API to use
> > our internal diff/merge algorithm on in-memory text blocks.
>
> And how would we know if the propvalues (svn_string_t) are
> contextually mergeable?

You don't, but if you want to put the burden on the client to do the
merge, at least we provide the api's to do the merges in our diff lib.

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 12 21:45:11 2007

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