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

Re: Checking out to a SVN directory

From: Matt Pounsett <matt.pounsett_at_cira.ca>
Date: 2004-09-08 20:08:13 CEST

On Sep 08, 2004, at 12:59, Edward Diener wrote:

> have always thought that different checkouts work fine with update and
> commit when starting at some top-level svn controlled directory and
> doing it
> recursively. In fact it would be hard to believe it does not. Each
> directory
> has its own .svn file, so it knows the repository path it points to.

On the face of it, I think you're correct here. However, I also think
you're missing a key piece of detail.

Say I check out 'trunk' from RepoA:

trunk/foo
trunk/bar
trunk/conf/
trunk/conf/foo
trunk/conf/bar

But then I want to put 'trunk/conf' from RepoB inside 'trunk/conf' from
RepoA:

rm trunk/conf/*
cd trunk/conf/
svn co http://server/repoB/trunk/conf .

and I get these files from RepoB:

trunk/conf/foo
trunk/conf/bar

Now.. you're correct that there's a .svn directory at trunk/conf/.svn/
which says that trunk/conf/foo and trunk/conf/bar belong to RepoB. But
there's also a .svn directory at trunk/.svn/ which says that all of
trunk/conf belongs to RepoA. And thus you have a conflict.

The solution of not including trunk/conf in RepoA is probably your best
bet... with the caveat that doing an 'svn status' in your working dir,
or in trunk/ will always list trunk/conf with a ? status.. since it
doesn't belong to RepoA.

Matt Pounsett CIRA - Canadian Internet Registration
Authority
Technical Support Programmer 350 Sparks Street,
Suite 1110
matt.pounsett@cira.ca Ottawa, Ontario,
Canada
613.237.5335 ext. 231
http://www.cira.ca

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 8 20:09:19 2004

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