Search code examples
svnbranchsvn-merge

Svnmerge and a file replaced with a directory

I'm using svnmerge.py to manage our repository. In trunk, file X has been replaced a directory. When trying to merge this to a branch, I get the error:

svn: Can't replace 'X' with a node of a differing type; the deletion must be committed and the parent updated before adding 'X' svn: Error reading spooled REPORT request response

I deleted X on the branch, and committed, but the same error persists. Thoughts?

Solution

  • IIRC you can do partial merges in SVN. Have you tried to merge up to the revision in which X was deleted, and then merge the resting revisions?