Re: conflict resolver callback question / enhancement request

Ben Collins-Sussman wrote:
> On 9/6/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
>> Hi,
>>
>> I'm currently implementing the new conflict resolver callback in TSVN.
>> And I'm not sure if I simply don't quite understand the data I get or
>> there's something missing:
>> how do I know whether the conflict is in the file contents or the file
>> properties? Or is the callback not invoked for property conflicts? If it
>> is, shouldn't there be some flag in the svn_wc_conflict_description_t
>> struct indicating whether it's a file or property conflict (or both)?
>>
>
> No, you're not missing anything. The feature isn't finished yet. :-)
>
> At the moment, the conflict-callback is only called on file-contents
> conflicts. On my TO-DO list is:
>
> - call the callback on prop-conflicts
> - call the callback from 'svn switch'
> - call the callback from 'svn merge'
>
> And yes, you're right: we should expand the conflict_description_t to
> indicate text vs. prop conflict.

And please consider not just a boolean for this. The property name would
be very useful: the svn: properties are basically text and could be
merged with the right tool instead of just keeping either the repository
or local props.

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