On 10/12/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> 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.
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.
Bye,
Erik.
Received on Fri Oct 12 19:55:40 2007