-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2006Q2@ryandesign.com]
Sent: Tuesday, May 02, 2006 2:38 PM
To: Allison Bloodworth
Cc: 'Mark Phippard'; users@subversion.tigris.org
Subject: Re: Problems creating trunk and branches from existing repository
On May 2, 2006, at 23:20, Allison Bloodworth wrote:
> 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?
I can't think of a reason for that to occur, unless you really have a
directory "trunk" inside the directory "trunk" in your repository.
(Can you check whether that is the case?)
Allison: I checked and didn't have a trunk inside trunk.
events@webfarm-dev-01:jeff[583]$ svn ls
svn+ssh://events@svn.berkeley.edu/svn/events/trunk
FreeEnergyModules/
build/
htdocs/
test_show.xml.php
> (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/
Presumably the last command was actually "ls"?
Allison: The last command was "ls checkouts/jeff" and the response was
"trunk" (I was just trying to show that a trunk directory was all that was
in that directory).
> 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
I don't know what all that means, but the working copy sure looks
confused. Unless you've got a lot of uncommitted modifications in
that working copy, I'd toss it and check out a new one.
Allison: Yes, you're right the working copy was confused, so I deleted all
the files and started over. However, I just want to make sure I don't have
to do that with other working copies that have more changes (this was my
test case).
I also ended up running into another problem when I did svn update:
events@webfarm-dev-01:jeff[578]$ svn status
! .
! build
! FreeEnergyModules
! htdocs
! S test_show.xml.php
events@webfarm-dev-01:jeff[579]$ svn update
Restored 'test_show.xml.php'
D test_show.xml.php
A build
A build/repair.sql
...
A htdocs/ucb.xsl
Updated to revision 247.
events@webfarm-dev-01:jeff[580]$ ls
FreeEnergyModules build htdocs
events@webfarm-dev-01:jeff[581]$ svn ls
svn+ssh://events@svn.berkeley.edu/svn/events/trunk
FreeEnergyModules/
build/
htdocs/
test_show.xml.php
All the other files populated in the "jeff" directory just fine, but for
some reason test_show.xml.php was eliminated. I see in the subversion book
the "S" means that that "file or dir has been switched to a branch", but I
don't even know how to "switch a file". The only switching I've done was to
switch where in subversion a working copy was pointing...what does this
mean?
---------------------------------------------------------------------
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:49:46 2006