3

我们的存储库由两个分支组成,默认分支(开发新功能的地方)和稳定分支(实施错误修复的地方)。当开发人员将默认分支合并到稳定分支并推送时,所有其他开发人员在尝试拉取或推送更改时收到错误 400:返回代码 255 的错误请求。

我们有多个其他存储库,它们驻留在同一台服务器上,但被不同的团队使用,这些团队似乎没有遇到相同的问题。我们的 Web 开发团队将相关存储库与 WebStorm IDE 结合使用。

这是我们第二次在同一个存储库中遇到这个问题。上次发生这种情况时,我们创建了一个新存储库并丢失了所有历史记录。显然,这不是理想的解决方案,而且是非常不可取的。我们想确定导致错误的原因是什么。

当我们克隆存储库时,问题会暂时解决,直到有人推送涉及合并两个分支的新更改,然后除了推送更改的人之外的每个人都开始收到错误。

以下是hg --debug --traceback pull的输出

C:\Dev\HosedPrism>hg --debug --traceback pull
using http://mercurialserver01:8080/hg/rproxweb_OLD/
sending capabilities command
using auth.rprox.* for authentication
http auth: user jpalumbo, password ********
pulling from http://mercurialserver01:8080/hg/rproxweb_OLD/
query 1; heads
sending heads command
http auth: user jpalumbo, password ********
searching for changes
taking initial sample
searching: 2 queries
query 2; still undecided: 208, sample size is: 200
sending known command
http auth: user jpalumbo, password ********
Traceback (most recent call last):
File "mercurial\dispatch.pyo", line 88, in _runcatch
File "mercurial\dispatch.pyo", line 743, in _dispatch
File "mercurial\dispatch.pyo", line 514, in runcommand
File "mercurial\dispatch.pyo", line 833, in _runcommand
File "mercurial\dispatch.pyo", line 804, in checkargs
File "mercurial\dispatch.pyo", line 740, in <lambda>
File "mercurial\util.pyo", line 475, in check
File "mercurial\extensions.pyo", line 144, in wrap
File "mercurial\util.pyo", line 475, in check
File "hgext\mq.pyo", line 3508, in mqcommand
File "mercurial\util.pyo", line 475, in check
File "mercurial\commands.pyo", line 4743, in pull
File "mercurial\localrepo.pyo", line 1670, in pull
File "mercurial\discovery.pyo", line 46, in findcommonincoming
File "mercurial\setdiscovery.pyo", line 182, in findcommonheads
File "mercurial\wireproto.pyo", line 115, in plain
File "mercurial\wireproto.pyo", line 163, in _submitone
File "mercurial\httppeer.pyo", line 170, in _call
File "mercurial\httppeer.pyo", line 118, in _callstream
File "urllib2.pyo", line 406, in open
File "urllib2.pyo", line 519, in http_response
File "urllib2.pyo", line 438, in error
File "urllib2.pyo", line 378, in _call_chain
File "urllib2.pyo", line 1078, in http_error_401
File "mercurial\url.pyo", line 407, in http_error_auth_reqed
File "urllib2.pyo", line 963, in http_error_auth_reqed
File "urllib2.pyo", line 974, in retry_http_digest_auth
File "urllib2.pyo", line 406, in open
File "urllib2.pyo", line 519, in http_response
File "urllib2.pyo", line 444, in error
File "urllib2.pyo", line 378, in _call_chain
File "urllib2.pyo", line 527, in http_error_default
HTTPError: HTTP Error 400: Bad Request
abort: HTTP Error 400: Bad Request

hg verify不会报告存储库中的任何损坏。

我尝试使用 hg rollback 命令,根据以下问题Mercurial 不断返回 Error 400: Bad Request。然而,这似乎并没有解决问题。

有没有人遇到过类似的问题?或者对问题可能是什么有任何见解?我将永远感激任何帮助,不仅是为了保存我们的历史,而且是为了防止这种情况在未来再次发生。

4

0 回答 0