Greg Stein <gstein@lyra.org> writes:
> > 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.
/me remembers nothings of the sort. But then, /me remembers fairly
little that happened longer than 30 seconds ago.
Wait. Now who was I replying to again?
> 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.
Agreed. But then, the update editor should be doing this for us, just
like it would treat any attempted removal of a working file with local
mods. The file should be removed from the entries file, but the
working file left untouched. 'svn st' should show a '?' for it, etc.
---------------------------------------------------------------------
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:36:25 2002