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

conflict resolver callback question / enhancement request

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-09-06 19:14:53 CEST

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)?

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 Thu Sep 6 19:11:47 2007

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