Re: Merging and switching

On Fri, Jan 25, 2002 at 08:34:55AM -0600, Ben Collins-Sussman wrote:
>
> * as Jay says, 'svn up' merely patches your working copy. It
> doesn't destroy local mods. And it certainly doesn't destroy
> unversioned items. As a result, the patching may result in a
> conflict (C), or in an "obstructed update" -- meaning the server
> is trying to add a new file to your working copy, but an
> unversioned item of the same name is in the way. When that
> happens, the update bails out.

Minor observation: It would be really nice if the "obstructed update"
code would notice when the file added to the repository was identical
to the obstructing file. It would then treat it as a case of a patch
which has already been applied to your working copy.

I frequently have to add fake records to CVS/Entries to force CVS to
do just that.

zw

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:00 2006