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

Re: Props conflict probably reported incorrectly on merge.

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-11-08 20:36:02 CET

"Alexander Kitaev" <alex@tmate.org> writes:

> So, subversion properly detects properties conflict and generates
> appropriate .prej file, but prop status reported is 'U', not 'C'.
>
> I suppose that there is a bug in Subversion, but it may happen that I just
> missed something.

Yes, that looks like a bug.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 8 20:37:17 2005

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