Re: svn cp treats filename as directory name

>I also noticed that when the Makefile "reappears" in revision 233
>that its contents match rev 2, as tested with
>svn diff -r2:233 svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile

I thought I figured out how to make the svn cp work like I want it to. The key observation was that the history of /trunk does not include rev 232:

r303 | (no author) | 2008-10-07 08:24:09 -0600 (Tue, 07 Oct 2008) | 1 line
r302 | (no author) | 2008-10-06 16:31:42 -0600 (Mon, 06 Oct 2008) | 3 lines
r301 | (no author) | 2008-10-06 16:31:22 -0600 (Mon, 06 Oct 2008) | 4 lines
r300 | (no author) | 2008-10-06 16:30:35 -0600 (Mon, 06 Oct 2008) | 3 lines
Copying the vendor branch with uClinux-dist-2008R1.5-RC3.tar.bz2.
r282 | (no author) | 2008-10-02 12:23:05 -0600 (Thu, 02 Oct 2008) | 1 line
r234 | (no author) | 2008-09-04 15:12:03 -0600 (Thu, 04 Sep 2008) | 2 lines
r233 | Matt | 2008-09-04 10:56:29 -0600 (Thu, 04 Sep 2008) | 1 line
Copied remotely
r2 | (no author) | 2007-07-17 10:35:25 -0600 (Tue, 17 Jul 2007) | 2 lines
As originally extracted from uClinux-dist-2007R1-RC3.tar.bz2.
r1 | steve.strobel | 2007-07-13 10:41:50 -0600 (Fri, 13 Jul 2007) | 1 line

Before the remote copy in rev 233, I think I deleted everything in the trunk. That means
that the trunk head traces its history back to wherever that copy came from, which probably
wasn't earlier in the trunk. Looking into "peg revisions". Reading
<http://svnbook.red-bean.com/en/1.5/svn.advanced.pegrevs.html>http://svnbook.red-bean.com/en/1.5/svn.advanced.pegrevs.html. Trying:

svn ls -r232 svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile # as before
svn: Unable to find repository location for 'svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile' in revision 232

svn ls -r232 svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile_at_232 # add peg revision
Makefile

svn ls svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile_at_232 # remove -r
Makefile

That seems to work. Trying adding the peg revision with the svn cp command:

svn cp -r232 svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile_at_232 svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile -m "Copying from rev 232 to maintain history of the files we changed."
svn: Failure opening '/trunk/linux-2.6.x/sound/blackfin/Makefile/Makefile'
svn: '/trunk/linux-2.6.x/sound/blackfin/Makefile' is not a directory in filesystem 'C:/Shared/SVN_Repo_uClinux/db'

Not only did that not do what I hoped, it brought back the goofy error message with Makefile being used as both the file and directory name. I thought that upgrading the Subversion client had fixed that problem. Trying without -r:

svn cp svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile_at_232 svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile -m "Copying from rev 232 to maintain history of the files we changed."
svn: Failure opening '/trunk/linux-2.6.x/sound/blackfin/Makefile/Makefile'
svn: '/trunk/linux-2.6.x/sound/blackfin/Makefile' is not a directory in filesystem 'C:/Shared/SVN_Repo_uClinux/db'

What is the correct syntax to copy (with history) that Makefile as it existed in the trunk in rev 232 to the head? If it was just this one file, I could use svn log with the peg revision to figure out when it last changed (apparently rev 101 in this case, see below) and copy that version, but this part of a script and I need to do it for a number of files.

svn log svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile_at_232
r106 | (no author) | 2007-10-09 10:07:20 -0600 (Tue, 09 Oct 2007) | 1 line
r2 | (no author) | 2007-07-17 10:35:25 -0600 (Tue, 17 Jul 2007) | 2 lines

Thanks for any suggestions,
Steve

---
Steve Strobel
Link Communications, Inc.
1035 Cerise Rd
Billings, MT 59101-7378
(406) 245-5002 ext 102
(406) 245-4889 (fax)
WWW: http://www.link-comm.com
MailTo:steve.strobel_at_link-comm.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org