Warning: file_get_contents(/data/phpspider/zhask/data//catemap/0/mercurial/2.json): failed to open stream: No such file or directory in /data/phpspider/zhask/libs/function.php on line 167

Warning: Invalid argument supplied for foreach() in /data/phpspider/zhask/libs/tag.function.php on line 1116

Notice: Undefined index: in /data/phpspider/zhask/libs/function.php on line 180

Warning: array_chunk() expects parameter 1 to be array, null given in /data/phpspider/zhask/libs/function.php on line 181
&引用;“交叉分支”;Mercurial和CruiseControl.Net出错_Mercurial_Build_Cruisecontrol.net - Fatal编程技术网

&引用;“交叉分支”;Mercurial和CruiseControl.Net出错

&引用;“交叉分支”;Mercurial和CruiseControl.Net出错,mercurial,build,cruisecontrol.net,Mercurial,Build,Cruisecontrol.net,我们正在迁移到Mercurial,当然,我们需要更新CruiseControl.Net构建过程以使用它而不是Visual SourceSafe 我们使用以下块更新了CruiseControl配置文件: <sourcecontrol type="hg" autoGetSource="true"> <executable>C:\Program Files\Mercurial\hg.exe</executable> <repo>https://b

我们正在迁移到Mercurial,当然,我们需要更新CruiseControl.Net构建过程以使用它而不是Visual SourceSafe

我们使用以下块更新了CruiseControl配置文件:

<sourcecontrol type="hg" autoGetSource="true">
  <executable>C:\Program Files\Mercurial\hg.exe</executable>
  <repo>https://bitbucket.org/GTSDevs/galaxy</repo>
  <workingDirectory>C:\Cruise Control\Releases\5.0.0\source</workingDirectory>
  <branch>master</branch>
  <multipleHeadsFail>false</multipleHeadsFail>
  <tagOnSuccess>true</tagOnSuccess>
  <timeout units="minutes">20</timeout>
</sourcecontrol>
我能找到的关于错误的所有信息似乎都与执行
更新有关

有人能帮我克服这一点吗

在我们的ccnet.config文件中是否还需要做些什么来支持Mercurial?

一些想法:

  • 最好的方法是向Mercurial源代码控制块添加一个新参数,以便添加
    --clean
    命令行参数
    • 一些想法:

      • 最好的方法是向Mercurial源代码控制块添加一个新参数,以便添加
        --clean
        命令行参数

      是您添加的命名分支吗?是您添加的命名分支吗?
      ThoughtWorks.CruiseControl.Core.CruiseControlException: Source control operation failed: abort: crosses branches (merge branches or use --clean to discard changes)
      . Process command: C:\Program Files\TortoiseHg\hg.exe update -r master --noninteractive
         at ThoughtWorks.CruiseControl.Core.Sourcecontrol.ProcessSourceControl.Execute(ProcessInfo processInfo)
         at ThoughtWorks.CruiseControl.Core.Sourcecontrol.Mercurial.Mercurial.GetSource(IIntegrationResult result)
         at ThoughtWorks.CruiseControl.Core.IntegrationRunner.Build(IIntegrationResult result)
         at ThoughtWorks.CruiseControl.Core.IntegrationRunner.Integrate(IntegrationRequest request)