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

Re: Merging and switching

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-01-25 21:07:40 CET

Zack Weinberg <zack@codesourcery.com> writes:

> 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.

Ooh, good idea.

---------------------------------------------------------------------
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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.