[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: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-12 18:56:05 CEST

On 10/12/07, Stefan Küng <tortoisesvn@gmail.com> wrote:

> > svn_wc_conflict_result_choose_base_propvalue
> > svn_wc_conflict_result_choose_their_propvalue
> > svn_wc_conflict_result_choose_my_propvalue
> > svn_wc_conflict_result_choose_mergede_propvalue
>
> Is a new enum really necessary? I mean, the callback doesn't get called
> for two conflicts at the same time (file and prop conflict). So the
> existing enum should be fine.

Good point! Let's re-use them; I'll just update the docstrings accordingly.

And yes, it will be the jobs of clients to do contextual merges of
property values. No svn core libraries are able to do this, and it's
not a trivial thing to add.

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

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