0

请注意：

c:\dev\shunra.old>hg log -r ecf --template '{files}' |tr " " "\012" | findstr ProductLicenseFeature

c:\dev\shunra.old>hg log -r ecf --template '{file_mods}' |tr " " "\012" | findstr ProductLicenseFeature
Application/ShunraLicense/src/com/shunra/common/license/ProductLicenseFeature.java

c:\dev\shunra.old>

那么，我们这里有什么？ecf是修订的前缀，它是合并其他两个修订的结果：

c:\dev\shunra.old>hg parents -r ecf --style compact
2430:2420   94067e763d55   2013-01-14 12:17 +0200   gilad
  Marge changes from S4HP9.0 branch

2443   a8f3e0a226eb   2013-01-15 00:48 +0200   genkor
  For empty locations and configurations take default content from templates.


c:\dev\shunra.old>

合并是在 TortoiseHg 中完成的。最奇怪的是，更改列表中没有显示特定文件，这与{files}模板关键字相对应。

但是它被改变了，并且确实{file_mods}模板关键字确实显示了它。

最终结果是我们无法信任 TortoiseHg 提供的更改列表，这是一件坏事。

到底是怎么回事？

4

1 回答 1

1

看看这个线程。也许这个文件是在合并过程中自动解析的？从那里引用：

A (automatic) merge will from one point of view not introduce any file
changes - only propagate changes that already has been made. From
another point of view it will introduce a number of "new" file changes
in another context and thus changes a lot of files. An intermediate
point of view is when both sides of a merge touches the same file and
the merge thus produces a combined file where the total content will be
new and unique.
于 2013-01-18T11:34:31.990 回答