svn/tortoise：从存储库外部提交现有文件
我最近从一组现有文件创建了一个 SVN 存储库，并对文件进行了一些小的标头更改。在创建存储库之前，另一位开发人员已对某些文件进行了大量更改，因此他的开发环境当前无法识别 SVN。也就是说，文件没有从存储库中检出。不幸的是我正在处理一组较旧的文件。
理想情况下，我想将两者合并，因为我的微小更改只是针对标题，并且不应该有任何冲突，但是最好的方法是什么？
我尝试过一项测试，用现有文件覆盖签出的文件，但似乎没有检测到当前版本文件和替换文件之间的差异。这可以通过签出、用他的副本覆盖、提交来完成，然后我可以签出他的副本并再次编辑它，但如果可能的话，这是我宁愿避免的工作。我目前正在使用 TortoiseSVN 来完成这一切。
I've recently created an SVN repository, from a set of existing files, and made some minor header changes to the files. Another developer had been making extensive changes to some files, before the repository was created, so his development environment is not currently aware of SVN. That is, the files were not checked out of the repository. Unfortunately I was working with an older set of files.
Ideally, I'd like to merge the two, as my minor changes are just to the header, and there shouldn't be any conflicts, but what's the best way of going about it?
I've tried a test where I overwrote a checked out file with his existing one, but it doesn't seem to detect a difference between the current versioned file and the replaced one. It could be done by checking out, overwriting with his copy, committing, then I could check his out and edit it again, but that's work I'd rather avoid, if at all possible. I'm using TortoiseSVN for all this at the moment.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
如果他是这方面的“主要”开发人员，并且您的变更集数量相当低，请考虑这条阻力最小的路径...重新开始。
创建一个新的存储库并签入他的文件，然后添加您的更改。
If he's the 'lead' develloper on this, and you have a fairly low changeset count, consider this path of least resistance... start over.
Create a new repository and check in his files then add your changes.