[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Is there such a thing as property conflicts?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-04-30 01:05:30 CEST

Ben Collins-Sussman <sussman@collab.net> writes:

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

Yes, that's a different problem.

Also update seems to be showing 'UU' when only the properties
change. Should this not be '_U'?

$ svn st
$ svn ps abc XXX foo
property `abc' set on 'foo'
$ svn ci -m ""
Sending trunk/foo

Committed revision 18.
$ svn up -r17
Updated to revision 17.
UU ./foo
$ svn up
UU ./foo
Updated to revision 18.

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 30 01:06:35 2002

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