Re: problem/bug with conflict callback
On Tue, 23 Oct 2007, Erik Huelsmann wrote:
> On 10/23/07, Stefan Küng <email@example.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...
I've addressed this in r27335. Erik, thanks for the analysis.
Stefan, thanks for the report. Would you please confirm that this
fixes the issue?
Received on Tue Oct 23 20:23:28 2007
- application/pgp-signature attachment: stored
This is an archived mail posted to the Subversion Dev