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

Re: Should deletes conflict with mods?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-02-07 22:19:05 CET

William Uther <willu.mailingLists@cse.unsw.edu.au> writes:

> Two people, A and B, have a file checked out.
> Person A deletes the file.
> Person B edits the file.
> Person A commits.
> Person B updates.
>
> In my mind, the update should cause a conflict. At present subversion
> simply removes the file from .svn/entries during the update, and
> leaves the locally modifed file around. I wonder if this shouldn't be
> marked as a conflict (somehow - possibly with a note in the entries
> file).

I agree, in my own mind, this has always been a what I call a "tree"
conflict rather than a textual conflict. There are number of "tree"
conflicts that can arise by permuting any two actions from {add,
delete, modify}. If you bother to write out all the permutations,
most of the scenarios result in failed commits. But the scenario you
point out has always troubled me.

> Do others also think there should be a conflict here? I couldn't find
> an issue about this. Should I file one?

The question is, how *should* the conflict be flagged? Do you have a
better idea than the status quo?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Feb 7 20:20:46 2003

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