Svnmerge and a file replaced with a directory

Question

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?

score 1 · Accepted Answer · answered Aug 07 '09 at 20:16

1

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?

answered Aug 07 '09 at 20:16

raven

2,574
2
27
49

I got someone else to do it, and it worked for them, so I can't test your suggestion. But it sounds like it could work, and there's no better idea, so I'm marking this as correct. – Paul Biggar Aug 10 '09 at 16:50

score 1 · Answer 2 · answered Jan 11 '11 at 17:58

1

Perform #svn up and then perfrom #svn add

answered Jan 11 '11 at 17:58

prba4

11
1

Svnmerge and a file replaced with a directory

2 Answers2