SVN解决问题：svn: warning: '#!/bin'不是工作副本
我正在处理一个主干和几个分支。在某一时刻，我向主干添加了一个文件（脚本），并将其合并到其余分支中（但没有提交分支更改）。
然后我再次修改了脚本，当我合并其余分支时，SVN 报告了树冲突。
A + C experimentation.sh
> local add, incoming add upon merge
当尝试解决时（使用 --accept 'working'、'theirs-full'、'mine-full'），我得到了令人难以置信的结果：
svn: warning: '#!/bin' is not a working copy
其中 #!/bin/bash 当然是脚本中的第一行文件。
到目前为止，我还没有成功摆脱这个问题，所以我无法做出进一步的承诺。非常感谢任何帮助。
I'm working with a main trunk and several branches. At one point, I have added a file (script) to the trunk, merged it throughout the rest of the branches (but didn't commit the branch changes).
Then I modified again the script and when I merged throughout the rest of the branches, SVN reported tree conflicts.
A + C experimentation.sh
> local add, incoming add upon merge
When trying to resolve (either with --accept 'working', 'theirs-full','mine-full'), I get an unbelievable:
svn: warning: '#!/bin' is not a working copy
where #!/bin/bash is, of course, the first line in the script file.
So far I've been unsuccessful in getting rid of this problem, so I can't make further commits. Any help much appreciated.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
当 svn 说某个内容不是工作副本时，这意味着您正在一个不是工作副本（或其一部分）的文件夹上应用 svn 命令 - 即没有
.svn元文件。我无法复制您的确切情况，但是，删除工作副本中的
#!/bin文件夹（您当然不需要！）并尝试操作。When svn says something is not a working copy, it means you are applying svn commands on a folder that is not a working copy ( or part of it) - ie doesn't have the
.svnmeta files.I am not able to replicate you exact situation, but, delete the
#!/binfolder in your working copy ( which you don't need of course!) and try the operations.