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

Re: conflict resolver callback question / enhancement request

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-09-06 19:48:31 CEST

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 6 19:45:27 2007

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