SVN 提交在 svn 控制之外更改、删除或添加的文件
我经常不是从 subversion 更改文件，而是从 finder 或其他来源更改文件。例如，最近，我从 WordPress 设置中更新了一些插件，我已为其创建了本地 svn 存储库，但值得注意的是，更新时的插件与 svn 中的内容冲突。添加到我没有从 svn 中删除或添加某些文件，当我这样做时：
svn status
...许多文件被标记为！等等。
如果我进行清理，它似乎无法解决冲突（我不是在谈论资源冲突，这可以通过执行 svn diff 来修复）。
如何重新同步在 svn 上下文之外更改的文件，并以适当的方式准备它们以进行提交。如果我没有道理，请直接说出来，我会尝试清理/编辑这篇文章。
I'm often changing files not from subversion, but from finder, or other sources. Recently, for example, I updated some plugins from a wordpress setup that I've created a local svn repository for, but notably, the plugins, on update are in conflict with what's in the svn. Add to that that I didn't delete or add certain files from svn, and when I do:
svn status
...many of the files are marked as ! and so forth.
If I do a cleanup, it doesn't seem to resolve the conflict (I'm not talking about resource conflicts, which can be fixed by doing an svn diff).
How do I resync files changed outside of the context of svn, and prep them for commit in the appropriate way. If I'm not making sense, just say so, and I'll try and clean up/edit this post.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
尝试 svn_load_dirs.pl 。它是为供应商分支机构设计的，这并不完全是您正在做的事情，但它应该可以处理您正在尝试做的事情，而不会遇到太多麻烦。
Try svn_load_dirs.pl. It's designed for vendor branches, which isn't exactly what you're doing, but it should handle what you're trying to do without too much trouble.