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

Re: problem/bug with conflict callback

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-10-23 17:24:42 CEST

On 10/23/07, Stefan K√ľng <tortoisesvn@gmail.com> wrote:
> Ben Collins-Sussman wrote:
> > I never tested property-conflicts on anything other than 'svn up'. In
> > other words, I made libsvn_wc/props.c invoke the callback many times,
> > because that's where prop-merging (and property conflicts) happens.
> > Is there *another* place where property-merging happens? Is it
> > somehow different for 'svn merge'?
>
> I guess I'm the wrong person to answer this question since I'm sure you
> are much more familiar with the Subversion code than I am. But since my
> script shows that the callback isn't called for property conflicts on
> merge, I guess there must be some other place where it should be called.

I've taken a peek, but libsvn_client/merge.c is calling
svn_wc_merge_props() instead of svn_wc_merge_props2() - the latter
having a prop-conflict callback whereas the former doesn't...

bye,

Erik.
Received on Tue Oct 23 17:24:54 2007

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