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

Re: svn switch to move between servers

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-09-17 19:42:54 CEST

Ben Collins-Sussman <sussman@collab.net> writes:
> If you have local mods on a file, and you run either 'svn up' or 'svn
> switch', and the tree you're receiving has that file missing, then you
> get a standard conflict: you changed a file, someone else deleted it.
> Big deal. At the moment, when such a conflict happens, your file
> becomes unversioned.
>
> (Although maybe we should file a bug here: the output never indicates
> any conflict at all!)

Solution: let's just take the file down from 'M' to 'A' :-).

That is, make the entry schedule=added (we can still display 'C'
during the update or switch, if we want, but after the operation is
over, the file would be scheduled for addition).

So, the user is less likely to accidentally lose changes, but is still
made aware that the file no longer exists in the repository head.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 17 20:06:15 2002

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