Question

Via command line, I usually do this:

cp -rRp /path/to/a\_folder/. /path/to/another\_folder 

This copies just the contents underneath a_folder to another_folder. In SVN I need to do the same thing, but can’t figure it out. I always end up with this:

/path/to/another\_folder/a\_folder 

SVN throws up even when I try this:

svn copy file:///path/to/a\_folder/* file:///path/to/another\_folder 

It says it does not exist.

EDIT:

This would probably help. The directory structure for my project looks like this:

my_project   /branches   /tags   /trunk   /vendor     /1.1 

I need to get the contents of 1.1 under vendor into the trunk without it actually copying the 1.1 folder.

Answer 1

Have you considered using svn merge?

Given a repo like this:

trunk/a_folder/foo trunk/a_folder/bar trunk/new_folder/baz 

use these commands to merge the foo and bar directories:

cd trunk/new_folder svn merge -r1:HEAD http://svn/repo/trunk/a_folder .