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

Re: Tree-conflicts: HEADS UP: update failure with tc-siblings :0

From: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 12 Nov 2008 10:29:27 +0100

Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:

> Hey guys,
> while trying to write a test for my most recent fix ("resolved" with
> --depth), I found a most horrendous failure in tree-conflicts reporting
> during update.
> See r34153 (on branch tc-resolve), inline comments in depth_tests.py's
> function make_depth_tree_conflicts(), marked "##". :O
> Had no time to investigate yet.
> ~Neels

Hi Neels,

I thinks this is a case where update "functions as designed". ;-)
The setup commits r2 with a prop edit to dir E and a text edit to
file E/alpha. In a working copy at r1, dir E is deleted. The
update tries to open E to apply the edits, but raises (one) tree
conflict because E is scheduled for deletion.

This is use case 1 in notes/tree_conflicts/detection.txt. Any
number of incoming changes to the locally-deleted tree are
"condensed" into one tree conflict, because they are all blocked
for the same reason.

I guess we need to test each depth scenario in its own tree.


Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +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: DE163214194
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-12 10:29:44 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.