Re: Tree conflict merry-go-round on update/switch

Julian Foad wrote:
> This idea is right except for the "diff" aspect.
>
> The Right Way to handle a tree conflict on Update/switch is definitely
> to update the text-base to the new version,

But we were discussing the case where the file in the repo was deleted,
so there's no new version of the text base available. You could update
to the last version before the deletion, but that would a) require
another roundtrip and complicate the editor drive, and b) be arguably
irrelevant since the original file is gone anyway.

Except in the case where the original wasn't deleted but renamed;
however *that* is a different use case, I'd expect the rename to be
replicated in the working copy ... different can of worms.

-- Brane

---------------------------------------------------------------------
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-26 20:43:54 CET