Re: Is there such a thing as property conflicts?

Philip Martin <philip@codematters.co.uk> writes:
> At present if I have local property changes they get overwritten by an
> update that affects the modified property
>
> $ svn ps abc def trunk/foo
> $ svn st
> _M ./trunk/foo
> $ svn up
> _U ./trunk/foo
> Updated to revision 15.
> $ svn st
> $ svn pg abc trunk/foo
> xyz
>
> Is this unexpected (to me anyway) loss of local property changes the
> correct behaviour?

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...

---------------------------------------------------------------------
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:47:07 2002