Re: Is there such a thing as property conflicts?

Karl Fogel <kfogel@newton.ch.collab.net> writes:

>
> No, it should conflict, leaving your changes in place and the
> received changes in a prej file somewhere (right, Ben?).
>
> Or vice versa, but either way, it should definitely show as a
> conflict...

Ouch, definitely a bug!

Isn't this bug #561?

Oh, no, that's slightly different.

Philip, if you have time, the problem is probably somewhere in
svn_wc_merge_prop_diffs.

(I think Philip has found more bugs than anyone else! He needs some
kind of special award.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 30 00:54:43 2002