Re: Repository stuck?

David Casti <david@neosynapse.net> writes:

> At 08:07 PM 11/10/2002, Karl Fogel wrote:
>
> >Do you remember exactly how you arranged things (that is, what was
> >switched where)? I wonder if you didn't accidentally point some
> >subdirectories at different repositories, or something... Anyway, a
> >complete description of your repository and working copy situation
> >will probably clarify here.
>
> The correct directory structure looks like this:
>
> /defender (base project)
> /defender/common (part of defender base project)
> /defender/client (subproject of defender)
> /defender/server (subproject of defender)
> /defender/neo_modules (base project)
> /defender/neo_modules/neo/defender (subproject of neo_modules)
>
> So, here's the repository configuration:
>
> /home/subversion/ is the top level of the repository
> /home/subversion/trunks was created by 'svn mkdir'
> /home/subversion/trunks/defender was created by 'svn import'
> /home/subversion/trunks/defender-client was created by 'svn import'
> /home/subversion/trunks/defender-server was created by 'svn import'
> /home/subversion/trunks/neo_modules was created by 'svn import'
> /home/subversion/trunks/neo_modules-neo-defender was created by 'svn import'
>
> As each of the subprojects were imported, a "stub" empty directory was
> left behind, to be attached by 'svn switch'. So, my checkout script
> does this --
>
>
> svn co file:///home/subversion/trunks/defender defender
> (this gives /defender and /defender/common, as well as empty
> directories /defender/client, /defender/server, /defender/neo_modules)
>
>
> svn switch file:///home/subversion/trunks/defender-client defender/client
> (this populates /defender/client)

I can run the following script without problem:

export REPO=file://`pwd`/repo
rm -rf repo defender defender-client defender-server
svnadmin create repo
svn mkdir $REPO/trunks

mkdir defender-client
mkdir defender-client/sub
echo zig >> defender-client/zig.c
echo zag >> defender-client/sub/zag.c
svn import $REPO/trunks defender-client defender-client

mkdir defender-server
mkdir defender-server/sub
echo foo >> defender-server/foo.c
echo bar >> defender-server/sub/bar.c
svn import $REPO/trunks defender-server defender-server

svn mkdir $REPO/trunks/defender
svn mkdir $REPO/trunks/defender/client
svn mkdir $REPO/trunks/defender/server

svn co $REPO/trunks/defender defender
svn sw $REPO/trunks/defender-client defender/client
svn sw $REPO/trunks/defender-server defender/server

echo x >> defender/client/zig.c
echo y >> defender/client/sub/newA.c
svn add defender/client/sub/newA.c

echo x >> defender/server/sub/bar.c
echo y >> defender/server/newB.c
svn add defender/server/newB.c

svn st -u defender
svn ci defender
svn st -u defender
svn up defender

Does that reproduce what you did? If not, how is it different?

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org