将 SVN 存储库与其旧版本的签出连接起来?
我正在解决基于 SVN 的问题,想寻求帮助。 我们使用 SVN 来版本化一个项目,有一个中央存储库,每个开发人员都有自己的结帐。如果我们开发,我们就会返回到中央存储库。 我们的新同事害怕提交到存储库,所以他不会破坏它,他只在本地签出文件夹(修订版 xxx1)中进行了更改。后来他因为某些原因离开了公司,他所做的所有工作都留在了他的本地文件夹中。中央存储库现在比他的本地结帐提前了 53 个修订,但我们需要获取他的工作(他花了近一个月的时间)并以某种方式将其连接到存储库。
有没有一种正常、轻松的方式告诉 SVN“这是一个包含他作品的文件夹,请显示与修订版 xxx1 相比,其中进行了哪些更改”,以便我可以解决冲突,检查他的代码并提交它?
我不可能要求他更新并提交,因为他现在与我们没有联系,我无法使用他的帐户(已删除)来完成这项工作。驱动器上仅保留已签出的文件夹。
我将非常感激在这里得到建议,因为在我看来,互联网上没有人遇到这个问题。
提前致谢, 雅库布
I am solving a SVN based issue and would like to ask for help.
We use SVN to version one project, there is a central repository and every developer has his own checkout. If we develop, we then comit back to the central repository.
Our new colleague was afraid to comit to the repository so he wouldn't break it and he only made changes in his local checkouted folder (revision xxx1). He then for some reasons left the company and all the work he did was left in his local folder. The central repository is now 53 revisions ahead of his local checkout, but we need to get his work (he spent almost a month working on it) and somehow connect it to the repository.
Is there a normal, painless way to tell SVN "This is a folder with his work, show me what changes have been made in it in compare to revision xxx1", so I can solve conflicts, check his code and comit it?
It is not possible that I ask him to update and commit as he has no connection to us now and I can not use his account (deleted) to do the work. Only the checkouted folder is left on the drive.
I would be very grateful to get an advice here as it seems to me that noone on the interent has this problem.
Thanks in advance,
Jakub
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
我不确定我是否正确理解了一切。
我假设:
如果我是对的,请尝试:
xxxx
的干净副本。.svn
文件夹)复制到带有干净副本的文件夹(上面创建的) - 您将获得他对修订版xxxx
的修改。祝你好运!
I am not sure if I understand correctly everything.
I assume that:
If am right try:
xxxx
..svn
folders) to folder with clean copy (created above) -- you get his modifications to revisionxxxx
.Good luck!