[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: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-31 18:40:53 CET

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 31 18:41:03 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.