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

Re: Problems with property conflict callback

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-01 18:20:18 CET

Ben Collins-Sussman wrote:
> Thanks for the script. After some IRC discussion with markphip and
> glasser, I've loosened up the logic a bit in libsvn_wc, passing a
> base_file to the conflict-callback even when there are two conflicting
> base-values to choose from. This should clear up the issue, I hope:
> please try out r27524.

Sorry for the late reply.

I've tested with r27550, and it works now.


   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 Nov 1 18:20:48 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.