How do I copy the files from one branch to another branch?

Question

I have something like this:

/repo/branch-a/foo/apples
/repo/branch-a/foo/oranges
/repo/branch-a/bar/broccoli
/repo/branch-a/bar/potato
/repo/branch-b/snazz
/repo/branch-b/jazz

now I want to move the snazz folder into a third subfolder of branch-b 'barfoo'

eg, afterwards, it will look like:

/repo/branch-a/foo/apples
/repo/branch-a/foo/oranges
/repo/branch-a/bar/broccoli
/repo/branch-a/bar/potato
/repo/branch-a/barfoo/snazz
/repo/branch-b/barfoo/jazz
/repo/branch-b/snazz
/repo/branch-b/jazz

The way I had initially tried to do this, was check out branch-a, and check out branch -b. Create the barfoo folder in branch-a, and then copy the snazz and jazz folders into barfoo folder.

The problem with this, is that the copy copies all the .svn folders, and so when you try commit, the files in those folders are still pointing back at the branch-b repo.

I could go through and delete all the .svn folders, but if there are a lot of subfolders, then this is quite time consuming, and not a good solution.

Answer 1

If you work with a Windows/Tortoise SVN:

I would checkout the repo, then move snazz and jazz with right mouse button from branch-a to branch-b and select "SVN move versioned items here". This way you will have SVN history preserved.

Answer 2

instead of copying, export them. if you export, its going to copy only the files not the .svn files. tortoisesvn has this option, you can drag and drop with the right click and choose export all.