[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: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-01-24 18:38:47 CET

"Sander Striker" <striker@apache.org> writes:
> Ok. Has this been taken into consideration?
>
> $ svn checkout http://svn.collab.net/repos/trunk -d svn
> A ...
> $ cd svn/subversion
> $ svn switch http://svn.collab.net/repos/branches/blue/subversion
> ...
> $ cd libsvn_fs
> $ svn switch http://svn.collab.net/repos/branches/red/subversion/libsvn_fs
> ...
>
> And to make it more interesting* maybe, replace the second switch to
> $ svn switch http://svn.collab.net/repos/trunk/subversion/libsvn_fs

Yes. :-)

> > We can assume that even disjoint urls are still all within the same
> > repository, because the parent of a disjoint child still has an entry
> > for that child, and all working copy walks are guided by entries. In
> > cases where there are wc subdirs from completely different
> > repositories, there is unlikely to be such entry linkage. [NOTE: We
> > will still be adding some extra information to the wc to make it
> > possible to check for the rare circumstance where the parent has an
> > entry for a subdir which (for whatever reason) is the result of a
> > checkout from a different repository. More on that later.]
>
> One of the 'rare' circumstances is subversion itself, where we checkout
> apr in our wc from another server. Granted, this is still cvs, so
> you'll have to imagine apr is in a svn repos on another server than
> svn.collab.net ;)

No -- the difference is that the parent doesn't have an entry for
subdir "apr/". Yes, there is a seperately checked out svn/apr
directory, but svn/.svn/entries doesn't know or care about it.

-K

---------------------------------------------------------------------
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:36:59 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.