Peter and Chris, thanks for your suggestions. Unfortunately, I gave up trying to understand what was happening and just fixed the problem, using the commands I pasted in at the end of this note. I don't think I checked out a WC inside of another WC, although it's not impossible. I suspect what might have happened was that I just used 'mkdir includes' and not 'svn mkdir includes', and then proceeded to 'svn add includes/' after I had created the files in the includes directory. I thought this was an acceptable form of working, but now I'm not sure.
Thanks, again, for all your help and suggestions.
-Kevin
kevinz@www:~/public_html/cigrants$ svn add includes/
svn: warning: 'includes' is already under version control
kevinz@www:~/public_html/cigrants$ svn log
------------------------------------------------------------------------
r1 | kevinz | 2004-12-30 10:40:39 -0500 (Thu, 30 Dec 2004) | 2 lines
System for the Care CORE Initiative Grants Database.
------------------------------------------------------------------------
kevinz@www:~/public_html/cigrants$ svn commit -m"Another committment to include include/."
kevinz@www:~/public_html/cigrants$ svn update
At revision 3.
kevinz@www:~/public_html/cigrants$ svn info
Path: .
URL: file:///home/kevinz/svn-repos/cigrants/trunk
Repository UUID: 9f746e0b-77ec-0310-9f18-cf27f3abe65e
Revision: 3
Node Kind: directory
Schedule: normal
Last Changed Author: kevinz
Last Changed Rev: 3
Last Changed Date: 2005-01-06 09:12:57 -0500 (Thu, 06 Jan 2005)
kevinz@www:~/public_html/cigrants$ svn status
? includes
kevinz@www:~/public_html/cigrants$ svn cleanup
kevinz@www:~/public_html/cigrants$ svn status
? includes
kevinz@www:~/public_html/cigrants$ mv includes/ t/
kevinz@www:~/public_html/cigrants$ svn mkdir includes
A includes
kevinz@www:~/public_html/cigrants$ cp -R t/* includes/
kevinz@www:~/public_html/cigrants$ ls -lR includes/
includes/:
total 8
-rw-r--r-- 1 kevinz wwwadmin 1821 Jan 6 10:42 config.php
-rw-r--r-- 1 kevinz wwwadmin 936 Jan 6 10:42 connect.php
-rw-r--r-- 1 kevinz wwwadmin 0 Jan 6 10:42 grantfooter.php
-rw-r--r-- 1 kevinz wwwadmin 0 Jan 6 10:42 grantheader.php
kevinz@www:~/public_html/cigrants$ rm -Rf t/
kevinz@www:~/public_html/cigrants$ svn status
? includes/connect.php
? includes/grantfooter.php
? includes/grantheader.php
? includes/config.php
A includes
kevinz@www:~/public_html/cigrants$ svn add includes/ ## I thought that this would have added the files in includes/, but the next command seems to be needed, too.
svn: warning: 'includes' is already under version control
kevinz@www:~/public_html/cigrants$ svn add includes/*
A includes/config.php
A includes/connect.php
A includes/grantfooter.php
A includes/grantheader.php
kevinz@www:~/public_html/cigrants$ svn commit -m"Commit to include includes/ and files."
Adding includes
Adding includes/config.php
Adding includes/connect.php
Adding includes/grantfooter.php
Adding includes/grantheader.php
Transmitting file data ....
Committed revision 4.
kevinz@www:~/public_html/cigrants$ cd ..
kevinz@www:~/public_html$ rm -Rf cigrants2
kevinz_at_www:~/public_html$ svn checkout file:///home/kevinz/svn-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/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 4.
kevinz@www:~/public_html$
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 6 17:45:56 2005