CODEWITHSUNDEEP
svnbranchsvn-merge
Paul Biggar
Paul Biggar

Reputation: 28769

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?

Upvotes: 0

Views: 733

Answers (2)

prba4
prba4

Reputation: 11

Perform #svn up and then perfrom #svn add

Upvotes: 1

raven
raven

Reputation: 2564

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?

Upvotes: 1

Related Questions