可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试):
问题:
I'm tring to commit a symlink into subversion, but I get this error when I try to add the actual symlink:
Can't replace 'path/to/symlink' with a node of a differing type; the deletion must be committed and the parent updated before adding 'path/to/symlink'
回答1:
I read it as - you have to remove the file, commit, update, create symlink, add it, commit.
And my guess is that you're trying to remove the file, create symlink, commit in one go.
回答2:
- svn delete x
- svn ci -m'blah'
- svn update
- ln -s blee x
- svn add x
回答3:
The error I got on svn 1.6.11 reads
svn: Commit failed (details follow):
svn: Entry '/path/to/symlink' has unexpectedly changed special status
I fixed it by simply
svn propset svn:special on /path/to/symlink
And then rerunning the commit. Apparently no need to delete, update, etc....
回答4:
find . -type l | xargs -i -x svn propset svn:special on {}