Please help untangle this newbie: nested directories

I don't know how this happened, but I got two different versions of my project nested in the same directory:
kevinz_at_www:~/public_html$ svn checkout file:///var/local/repos/cigrants/trunk cigrants2
A cigrants2/includes
A cigrants2/includes/connect.php
A cigrants2/includes/grantfooter.php
A cigrants2/includes/grantheader.php
A cigrants2/includes/config.php
A cigrants2/obsolete
A cigrants2/obsolete/buildOrderDB.pl
A cigrants2/Makefile
Checked out revision 4.
kevinz@www:~/public_html$ rm -Rf cigrants2/
kevinz_at_www:~/public_html$ svn checkout file:///var/local/repos/cigrants/cigrants/trunk cigrants2 #NOTE the extra 'cigrants'
A cigrants2/includes
A cigrants2/includes/connect.php
A cigrants2/includes/grantfooter.php
A cigrants2/includes/grantheader.php
A cigrants2/includes/config.php
A cigrants2/help
A cigrants2/help/addregion.php
A cigrants2/help/addcountry.php
A cigrants2/help/addactivity.php
A cigrants2/addgrant.php
A cigrants2/utilities
A cigrants2/utilities/regions.txt
A cigrants2/utilities/countries.txt
Checked out revision 9.
kevinz@www:~/public_html$

The version in /var/local/repos/cigrants/cigrants/trunk is the correct branch, and has all the updated files in it, but I don't like it's pathname, and would like to use /var/local/repos/cigrants/trunk. I'm really new to Subversion, and am afraid of messing up the repository totally. Can anyone help me with the commands necessary to fix this situation, hopefully keeping all the history of the 9 revisions of the correct version up to this point? Is it as simple as deleting everything in /var/local/repos/cigrants/trunk and moving /var/local/repos/cigrants/cigrants/trunk to /var/local/repos/cigrants/trunk?

Thanks in advance for your help.

-Kevin Zembower

-----
E. Kevin Zembower
Internet Systems Group manager
Johns Hopkins University
Bloomberg School of Public Health
Center for Communications Programs
111 Market Place, Suite 310
Baltimore, MD 21202
410-659-6139

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 24 15:41:36 2005