Re: issue 3899 (copying conflict victims)
From: Stephen Butler <sbutler_at_elego.de>
Date: Fri, 27 May 2011 12:25:34 +0200
On May 26, 2011, at 17:56 , Philip Martin wrote:
> Julian Foad <julian.foad_at_wandisco.com> writes:
I agree that the references to the A/f files should not exist. But I
For the text conflict, if we tweak the marker file paths at the copy
For a copied property-conflicted item X, the .prej file at the copy
Trying to add new property 'score' with value '1',
which is also misleading. Granted, it's possible that someone just
For a tree conflict victim checked out from ^/Y and copied to local
- nothing exists in the repos at Z's path
(hmmm, are there any other cases?)
In either case, there's no tree conflict at Z.
-- Stephen Butler | Senior Consultant elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany tel: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194Received on 2011-05-27 12:26:12 CEST
This is an archived mail posted to the Subversion Dev mailing list.