将 SVN 存储库与其旧版本的签出连接起来?

发布于 2025-01-03 19:31:22 字数 467 浏览 0 评论 0原文

我正在解决基于 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 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(1

或十年 2025-01-10 19:31:22

我不确定我是否正确理解了一切。

我假设:

  1. 您有存储库的工作副本(或者至少您知道其存储库副本的修订号)。
  2. 您无法使用此副本,因为未连接到 SVN 服务器(无帐户)并且您不想破解它。

如果我是对的,请尝试:

  1. 签出他上次更新其存储库的修订号中的项目 - 您将获得修订版 xxxx干净副本
  2. 将文件从他的文件夹(省略 .svn 文件夹)复制到带有干净副本的文件夹(上面创建的) - 您将获得他对修订版 xxxx 的修改。
  3. 检查它是否有效/编译。
  4. 将存储库更新到当前版本并解决所有冲突。
  5. 检查它是否仍然有效/编译。
  6. 提交更改——应该完成。

祝你好运!

I am not sure if I understand correctly everything.

I assume that:

  1. You have working copy of repository (or at least you know revision number of his repository copy).
  2. You cannot use this copy because is not connected to SVN server (no account) and you don't want to hack it.

If am right try:

  1. Checkout project in revision number he last updated his repository -- you get clean copy of revision xxxx.
  2. Copy files from his folder (omitting .svn folders) to folder with clean copy (created above) -- you get his modifications to revision xxxx.
  3. Check if it works/compile.
  4. Update repository to current version and resolve all conflicts.
  5. Check if it still works/compile.
  6. Commit changes -- should be done.

Good luck!

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文