[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-dev
Subject:    Re: Problems with property conflict callback
From:       "Mark Phippard" <markphip () gmail ! com>
Date:       2007-10-31 20:24:37
Message-ID: ff892c5d0710311324n6e921dd5h73f797815351ffc () mail ! gmail ! com
[Download RAW message or body]

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

[prev in list] [next in list] [prev in thread] [next in thread]