"Matt Pounsett" <matt.pounsett@cira.ca> wrote in message
news:0CE009DE-01C2-11D9-8495-000A95B212E6@cira.ca...
>
> 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.
I hope you are kidding that an .svn file contains information about all .svn
directories below it as to what those individual directories point to. What
a horrendous design decision that would be.
> And thus you have a conflict.
I hope you are wrong about this.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 8 22:09:34 2004