Re: svn commit: r937524 - in /subversion/trunk/subversion: libsvn_wc/props.c tests/cmdline/prop_tests.py tests/cmdline/svntest/sandbox.py

On Fri, May 21, 2010 at 10:53, Paul Burba <ptburba_at_gmail.com> wrote:
> On Thu, May 20, 2010 at 4:59 PM, Greg Stein <gstein_at_gmail.com> wrote:
>> Thanks for the ping.
>>
>> The patch looks good except for the incoming-delete case.
>
> Hi Greg,
>
> Which flavor of that case? Incoming delete on a local delete of the
> same property with the same value?  Or something else?
>
>> If the
>> svn_string_compare() succeeds, but mine==NULL, then you get the crash.
>> I think the mine==NULL needs to remain on the outer-if test.
>
> I'm not entirely sure what you are referring to here.  Is it this
> section of generate_conflict_message()?

That section, yeah. But you're right. We should be okay.

Go ahead and commit. I've got a couple ideas to clarify a few of the
assertions afterwards, so that (I) won't get confused around this
stuff again.

Cheers,
-g
Received on 2010-06-04 20:01:01 CEST