我的回购有:
@ 2:85bb423103fb99137985c7e218ab4d5896e1aea0:default
| removed file a
|
| o 1:46b6b63ecf64e8f108c83af85a46fd4c89335d74:b
|/ Modified file a
|
o 0:bbf90d08b30cd007038eaf7f8d3d1215ade86005:default
Created file a
现在运行 hg merge b,我得到:
hg merge b
remote changed a which local deleted
use (c)hanged version or leave (d)eleted? c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
现在运行 hg diff,我得到:
hg diff
diff -r 85bb423103fb a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Wed Oct 09 12:18:45 2013 +0800
@@ -0,0 +1,1 @@
+bbb
我期望的行为是让 /dev/null 进行比较(文件已在 hg 中删除)。hg 状态应显示:
hg status
? a
但是,hg status 显示:
hg status
M a
为什么 Hg 报告此处文件已被修改?