tags:

views:

36

answers:

1

I have duplicate directory structures in two locations that I need to merge together in an svn repository. By "merge" I mean I want all files and folder that are unique to structure b to be moved into structure a. When I try to do this using svn move I get the error

svn: Path 'com' already exists

The folders look like:

src
 -> com
    -> (many more files and directories)
 -> java
    -> com
       -> (some files and folders, some folders overlap but all files are unique)

src\com is a and src\java\com is b.

A: 

You could svn merge the entire history of the source 'com' path in to the destination path, which will preserve the history of those files e.g.

svn merge -r 1:HEAD svn://repository-path-to/com working-copy-path-to/com

You need to make sure the revision range includes the revision that adds the first files to the source 'com' folder.

TheJuice
This did not work. I ran every variation of this I could and nothing happened, no errors, no changes, nothing. I appreciate the effort though :)
Nash0