hg - 当 hg 推送超时时该怎么办

发布于 2024-10-10 06:55:34 字数 1617 浏览 0 评论 0原文

更新 - 我可能很愚蠢,请参阅下面我的最新更新。

我刚刚执行了 hg Push 并且超时了,现在当我再次尝试 hg Push 时,我收到一条消息“未发现任何更改”,但是我可以在目标中看到回购协议表明,除了少数更改外,所有更改都没有进入回购协议。我如何将更改推送到该存储库?

这背后的历史是我从 SVN 迁移到 Mercurial (bitbucket)。我已完成以下操作:

  • 使用 svnsync 获取 SVN 存储库的本地副本。
  • 在 bitbucket 中创建了一个新的存储库
  • 将存储库克隆到我的本地计算机
  • 完成从本地 SVN 存储库到本地 Hg 存储库的 svnadmin Convert
  • 运行 hg Push 将更改推送到

bitbucket最后一个命令提示我进行 HTTP 授权,然后说“搜索更改”,超过 15 分钟没有输出,然后输出“中止:HTTP 错误 504:网关超时”。完整的过程是:

C:\dev\sandbox\svn_to_hg\dev_hg>hg push
http authorization required
realm: Bitbucket.org HTTP
user: my_login
password:
pushing to https://bitbucket.org/my_login/dev
searching for changes
abort: HTTP Error 504: Gateway Time-out

C:\dev\sandbox\svn_to_hg\dev_hg>hg push
http authorization required
realm: Bitbucket.org HTTP
user: my_login
password:
pushing to https://bitbucket.org/my_login/dev
searching for changes
no changes found

似乎因为有太多的更改,所以在 HTTP 身份验证和实际推送更改或类似的事情之间花费的时间太长,并且如果我设置 SSH 密钥,则可能不需要缓存 HTTP身份验证,这样就不会超时。如果这是正确的,有什么想法吗?无论如何,我仍然需要知道如何推动 hg 现在认为已经推动的这些改变。

在我的 bitbucket 存储库中,有大约 20 个几年前来自 SVN 的变更集,但应该有几千个。

更新:

hg out 给了我这个:

C:\dev\sandbox\svn_to_hg\dev_hg>hg out
http authorization required
realm: Bitbucket.org HTTP
user: my_login
password:
comparing with https://bitbucket.org/my_login/dev
searching for changes
no changes found

使用 TortoiseHg 存储库浏览器查看存储库显示那里有大量的东西。

更新:

也许我很愚蠢,现在当我查看 bitbucket 中的存储库时,似乎确实有很多变更集。但什么超时了?我是否应该担心我的所有变更集都没有到达服务器?

UPDATE - I'm probably being daft, see my last update below.

I just did a hg push and it timed out, and now when I try hg push again I get a message 'no changes found', however I can see in the target repo that all but a few of the changes didn't make it to the repo. How can I push my changes to that repo?

The history behind this is I'm migrating from SVN to Mercurial (bitbucket). I've done the following:

  • Used svnsync to get a local copy of the SVN repository.
  • Created a new repo within bitbucket
  • Cloned the repo to my local machine
  • Done svnadmin convert from my local SVN repo to my local Hg repo
  • Run hg push to push the changes to bitbucket

The last command prompts me for HTTP authorisation, then says 'searching for changes', no output for >15 mins, then output 'abort: HTTP Error 504: Gateway Time-out'. Full process was:

C:\dev\sandbox\svn_to_hg\dev_hg>hg push
http authorization required
realm: Bitbucket.org HTTP
user: my_login
password:
pushing to https://bitbucket.org/my_login/dev
searching for changes
abort: HTTP Error 504: Gateway Time-out

C:\dev\sandbox\svn_to_hg\dev_hg>hg push
http authorization required
realm: Bitbucket.org HTTP
user: my_login
password:
pushing to https://bitbucket.org/my_login/dev
searching for changes
no changes found

It seems that because there are so many changes it's taking too long between HTTP auth and when it actually pushes the changes, or something like that, and probably if I set up SSH keys it'd not need to cache the HTTP authentication so it wouldn't time out. Any ideas if that's correct? Regardless, I still need to know how to push these changes that hg now thinks have already been pushed.

In my bitbucket repository there are about 20 changesets from SVN from a few years ago, but there should be several thousand.

UPDATE:

hg out gives me this:

C:\dev\sandbox\svn_to_hg\dev_hg>hg out
http authorization required
realm: Bitbucket.org HTTP
user: my_login
password:
comparing with https://bitbucket.org/my_login/dev
searching for changes
no changes found

Looking at the repo using TortoiseHg repo browser shows there is tons of stuff there.

UPDATE:

Perhaps I'm being daft, now when I look at the repo within bitbucket it does seem that there are lots of changesets. But what timed out? Should I worry that all my changesets didn't make it to the server?

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

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

发布评论

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

评论(1

半﹌身腐败 2024-10-17 06:55:34

似乎所有变更集都成功了 - 即答案是重试,然后信任 Mercurial。

It seems that all changesets did make it - i.e. answer is to retry and then trust Mercurial.

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