Thanks very much Mark & Ryan for your help. I'm not sure if this is my
problem because I just created a test branch in subversion using copy and it
worked fine (e.g. no trunk directory at the top):
events@webfarm-dev-01:jeff[539]$ svn copy
svn+ssh://events@svn.berkeley.edu/svn/events/trunk
svn+ssh://events@svn.berkeley.edu/svn/events/branches/test -m "creating a
test branch to see if trunk comes over"
Committed revision 247.
events@webfarm-dev-01:jeff[543]$ svn ls
svn+ssh://events@svn.berkeley.edu/svn/events/branches/test
FreeEnergyModules/
build/
htdocs/
test_show.xml.php
However, the problem is that now when I try to switch a checkout that is
currently pointing at events to point to events/trunk, I get the trunk
directory in the checkout (which I don't want!). Is there any way out of
this?
(checkouts/jeff begins pointed at
svn+ssh://events@svn.berkeley.edu/svn/events)
cd checkouts/jeff
ls
build/ htdocs/ FreeEnergyModules/test_show.xml.php
svn switch svn+ssh://events@svn.berkeley.edu/svn/events/trunk
ls checkouts/jeff
trunk/
Sidenote: I'm not actually able to get the directory structure above to
populate because I'm getting messages that "." is locked and svn cleanup
doesn't fix it, so if anyone has advice on fixing this that would also be
much appreciated:
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
events@webfarm-dev-01:jeff[531]$ svn status
! L .
L build
S build/repair.sql
S build/create.sql
S build/dummy_data.sql
S build/drop.sql
S build/optimize.sql
? trunk/build
! L S trunk
! L trunk/FreeEnergyModules
! L trunk/FreeEnergyModules/screen
L trunk/FreeEnergyModules/screen/manager
L S FreeEnergyModules
L FreeEnergyModules/screen
L FreeEnergyModules/screen/manager
L FreeEnergyModules/screen/public
L FreeEnergyModules/navigation
L FreeEnergyModules/utility
L FreeEnergyModules/database
L FreeEnergyModules/configuration
L FreeEnergyModules/layout
L FreeEnergyModules/action
! htdocs
S test_show.xml.php
events@webfarm-dev-01:jeff[532]$ svn cleanup
svn: In directory '.'
svn: Error processing command 'delete-entry' in '.'
svn: Working copy 'trunk' is missing or not locked
events@webfarm-dev-01:jeff[533]$ svn status
! L .
S build/repair.sql
S build/create.sql
S build/dummy_data.sql
S build/drop.sql
S build/optimize.sql
? trunk/build
! S trunk
! trunk/FreeEnergyModules
! trunk/FreeEnergyModules/screen
S FreeEnergyModules
! htdocs
S test_show.xml.php
-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2006Q2@ryandesign.com]
Sent: Tuesday, May 02, 2006 1:42 PM
To: Allison Bloodworth
Cc: users@subversion.tigris.org
Subject: Re: Problems creating trunk and branches from existing repository
On May 2, 2006, at 22:33, Allison Bloodworth wrote:
> I made a trunk directory and a branches/allison directory and
> then moved everything from events to events/trunk (see commands
> used below).
> Then to copy what was in the trunk directory to the allison branch,
> I was
> unable to do move things in the way the book suggested:
>
> svn copy svn+ssh://events@svn.berkeley.edu/svn/events/trunk
> svn+ssh://events@svn.berkeley.edu/svn/events/branches/Allison
>
> ...because it created a trunk directory under "allison".
This behavior is correct and matches that of the Unix copy command:
"cp a b" creates a directory "a" inside "b" if "b" already exists,
otherwise it copies "a" to "b". To get the behavior you wanted,
simply do not create the directory "Allison" in advance, and let the
"svn copy" command create it for you.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 2 23:21:34 2006