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

Re: disallowing commit of a deletion of a deleted file (was: Re: deleted-with-history [sic] after merge)

From: Stephen Butler <sbutler_at_elego.de>
Date: Thu, 20 Mar 2008 18:12:32 +0100

Quoting Stefan Sperling <stsp_at_elego.de>:
> Instead of the commit succeeding (leaving the developer with the impression
> that the file was deleted, even though it was renamed), the developer
> should be forced to update (the deleted file being out-of-date).
> The developer will then receive the delete of the already locally deleted
> file, which our current implementation will flag as a potential
> tree-conflict.
> The developer should then take this a warning sign, check the resulting tree
> for sanity, take appropriate action if need be and mark the conflict as
> resolved. Now the commit can take place without risk of causing trouble
> further down the road.
> I admit that this sounds a bit unwieldy, since we could essentially
> already flag a tree-conflict during the commit phase, upon discovering
> that the file is missing in the repository, without requiring the extra
> update.

A cautionary note about flagging tree conflicts during commit:

The current tree-conflicts plan has a simple division of labor. The
update/switch/merge commands detect tree conflicts and flag them in
the working copy. The commit command stops with an error if it
finds a flagged conflict.

The user then removes the conflict flags using the resolved or revert
commands, and tries to commit again.

Suppose we extend commit to detect tree conflicts and flag them in
the working copy. The user would have no chance to resolve the
conflicts. We would need a special list of "tree conflicts detected
by commit" and would have to track which of them were already

Being a little more strict about requiring an up-to-date working
copy is much simpler.


> But in any case, the commit needs to be blocked if we want to have
> a chance at informing the developer whether a delete about to be committed
> may actually end up being a rename.

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-03-20 18:12:48 CET

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