[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-24 17:32:52 CEST

Daniel Rall wrote:
> On Tue, 23 Oct 2007, Erik Huelsmann wrote:
>
>> 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...
>
> 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?

Confirmed! It works now as expected.
I still have to implement the whole property conflict stuff in TSVN
though, but the callback is called properly now.

Thanks a lot, Daniel!

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 24 17:33:20 2007

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