tree conflicts and obstructions
From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 27 Mar 2008 12:46:04 +0100
Hello Steve, Julian, Nico, and others interested,
One of the failing tests on the tree-conflicts branch shows that
Namely, we have not yet defined how svn should behave if a file
Currently, during update and switch obstructions cause the operation
I think this behaviour suits us fairly well already.
But obstructed files are currently silently skipped during merge!
I suppose we should flag obstructed files as tree conflict
Julian has already expressed implicit consent in
We should update detection.txt accordingly, and possibly also
-- Stefan Sperling <stsp_at_elego.de> Software Developer elego Software Solutions GmbH HRB 77719 Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96 13355 Berlin Fax: +49 30 23 45 86 95 http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
This is an archived mail posted to the Subversion Dev mailing list.