为什么刷新我的mq补丁会在工作目录中留下修改过的文件?

时间:2011-09-06 18:57:12

标签: mercurial mercurial-queue

请观察:

PS Z:\dev> hg version
Mercurial Distributed SCM (version 1.9.2)
(see http://mercurial.selenic.com for more information)

Copyright (C) 2005-2011 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
PS Z:\dev> hg st
A windows\NC\NC.Entities.Agent\DTO\StartTask.cs
A windows\nc\NC.Entities.Agent\DTO\Sample.cs
A windows\nc\NC.Entities.Agent\DTO\StopTask.cs
A windows\nc\NC.Entities.Agent\DTO\Task.cs
A windows\nc\NC.Entities.Agent\Web\Sample.cs
PS Z:\dev> hg qrefresh -v
windows/Common/Shunra.Common.Contract/Shunra.Common.Contract.SL.csproj
windows/NC/NC.Client.SL.Web/Bootstrapper.cs
windows/NC/NC.Entities.Agent.Contract/NC.Entities.Agent.Contract.csproj
windows/NC/NC.Entities.Agent/DTO/AgentInfo.cs
windows/NC/NC.Entities.Agent/DTO/Sample.cs
windows/NC/NC.Entities.Agent/DTO/StopTask.cs
windows/NC/NC.Entities.Agent/DTO/Task.cs
windows/NC/NC.Entities.Agent/NC.Entities.Agent.csproj
windows/NC/NC.Entities.Agent/Web/AgentInfo.DTO.cs
windows/NC/NC.Entities.Agent/Web/AgentInfo.cs
windows/NC/NC.Entities.Agent/Web/Sample.DTO.cs
windows/NC/NC.Entities.Agent/Web/Sample.cs
windows/NC/NC.Entities.Agent/Web/SampleSet.cs
windows/NC/NC.Entities.Agent/Web/StartTask.DTO.cs
windows/NC/NC.Entities.Agent/Web/StartTask.cs
windows/NC/NC.Entities.Agent/Web/StopTask.DTO.cs
windows/NC/NC.Entities.Agent/Web/StopTask.cs
windows/NC/NC.Entities.Server/AgentPortal.AgentEntitiesMarshal.cs
windows/NC/NC.Entities.Server/AgentPortal.PrimitivesMarshal.cs
windows/NC/NC.Entities.Server/AgentPortal.cs
windows/NC/NC.Entities.Server/ExecutionInfoProvider.cs
windows/NC/NC.Entities.Server/Handlers/AgentInfoHandler.cs
windows/NC/NC.Entities.Server/Handlers/SampleHandler.cs
windows/NC/NC.Entities.Server/Handlers/TaskHandler.cs
windows/NC/NC.Entities.Server/IExecutionInfoProvider.PrimitivesMarshal.cs
windows/NC/NC.Entities.Server/IProtocolMetadataResolver.cs
windows/NC/NC.Entities.Server/IProtocolValuesHelper.cs
windows/NC/NC.Entities.Server/Mobile/Web/MobileRunReport.cs
windows/NC/NC.Entities.Server/NC.Entities.Server.csproj
windows/NC/NC.Entities.Server/ProtocolMetadataResolver.cs
windows/NC/NC.Entities.Server/ProtocolValuesHelper.cs
windows/NC/NC.Entities/Rest/ProtoBufSerializer.cs
windows/NC/NC.ProtoBuf/NC.ProtoBuf.SL.csproj
windows/nc/NC.Entities.Agent/DTO/PrimitiveCollection.cs
windows/nc/NC.Entities.Agent/DTO/StartTask.cs
windows/nc/NC.Entities.Agent/DTO/String2String.cs
windows/nc/NC.Entities.Agent/DTO/StringTPair.cs
windows/nc/NC.Entities.Agent/DTO/StringTPairList.cs
PS Z:\dev> hg st
A windows\NC\NC.Entities.Agent\DTO\StartTask.cs
A windows\nc\NC.Entities.Agent\DTO\Sample.cs
A windows\nc\NC.Entities.Agent\DTO\StopTask.cs
A windows\nc\NC.Entities.Agent\DTO\Task.cs
A windows\nc\NC.Entities.Agent\Web\Sample.cs
PS Z:\dev>

我不清楚为什么 hg status 在刷新MQ补丁后返回相同的添加文件?请注意,这些文件确实出现在 hg qrefresh的详细输出中。

我现在该怎么办呢?

感谢。

1 个答案:

答案 0 :(得分:2)

nc输出和NC之间,遗漏的文件中hg qrefresh -vhg st目录的大小不同。

尝试忘记hg st报告的文件,并使用正确的大小写添加它们。