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 message: [ Message body ]
Next message: Philip Martin: "Re: Possible incorrect merge status on update."
Previous message: Madan U Sreenivasan: "Re: svn trunk r17244: FAIL (x86_64-unknown-linux-gnu static ra_svn fsfs)"
In reply to: Alexander Kitaev: "Props conflict probably reported incorrectly on merge."
Next in thread: Daniel Rall: "Re: Props conflict probably reported incorrectly on merge."
Reply: Daniel Rall: "Re: Props conflict probably reported incorrectly on merge."

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]