[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-31 21:24:37 CET

On 10/31/07, Ben Collins-Sussman <sussman@red-bean.com> 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.

I do not remember if I pinged you on IRC, but things seem to be
working better now.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 31 21:24:50 2007

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