[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: Greg Stein <gstein_at_lyra.org>
Date: 2002-09-17 19:30:58 CEST

On Tue, Sep 17, 2002 at 12:09:29PM -0500, Ben Collins-Sussman wrote:
> Greg Stein <gstein@lyra.org> writes:
> > On Tue, Sep 17, 2002 at 02:23:52PM +0200, Timothee Besset wrote:
> > > Yeah .. from software architecture standpoint it makes sense. From a user
> > > perspective though, it seems to me that the situation 'I made a bunch of
> > > changes to this working copy, I want to commit it to a new branch' is a
> > > very common situation.
> >
> > Actually, you can't switch if you have local modifications. Sounds like you
> > hit some other problem, but you still wouldn't be able to switch with local
> > mods.
>
> Watchootalkinbout?
>
> 'svn switch' is EXACTLY the same as 'svn update'. Identical code
> paths. They both compare two urls, and apply the differences to your
> working copy.
>
> Just like 'svn up', 'svn switch' will merge changes into your local
> mods, creating conflict markers if necessary.

Hunh. I thought we were going to disallow switching with local mods. If
somebody changes a file, then it doesn't necessarily apply to that same file
on a different branch.

At a minimum, if local mods are present on a file which is not present in
the new location, then the switch should bail rather than tossing the
change.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 17 19:31:03 2002

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