I have a SVN repository for a piece of software developed by a third party. My repository has the following three directories:
trunk
oldVersion
newVersion
I'm trying to use the following svn command to upgrade from version 1 to 2:
svn merge oldVersion@HEAD newVersion@HEAD . --ignore-ancestry
where the working directory contains a checkout of trunk. The merge works EXCEPT for files which only exist in the oldVersion or in the newVersion. For every file which only exists in the old version, I get a line which says:
Skipped missing target: <filename>
For every file which only exists in the new version, I get a line which says the following:
Skipped <filename>
As a result, files deleted in the new version are still present in trunk and files which were added in the new version are not added to trunk. What did I do wrong with my merge command? Is this desired/intended behavior with SVN?
Note: trunk has some customizations and theming which is not present in the newVersion.