我今天遇到了一个非常奇怪的问题,我做了一个从分支到主干的svn合并,并且合并的输出如下所示,正如我们所看到的,文件'sncpStateInd.cfg'被合并删除了,但是svn状态不显示它,任何人都可以帮我检查一下吗?感谢
--- Merging r30994 through r31381 into 'aaa/bbb/ccc/ddd/ccp10_scripts/cfg':
U aaa/bbb/ccc/ddd/ccp10_scripts/cfg/testSuiteODU.cfg
A aaa/bbb/ccc/ddd/ccp10_scripts/cfg/lib/telink_metric.cfg
A aaa/bbb/ccc/ddd/ccp10_scripts/cfg/lib/telink_srlg.cfg
D aaa/bbb/ccc/ddd/ccp10_scripts/cfg/lib/sncpStateInd.cfg
[xuzhijun@test aaa/bbb/ccc/ddd/ccp10_scripts/cfg/lib]$ svn st
M .
A + telink_metric.cfg
A + telink_srlg.cfg
[xuzhijun@test aaa/bbb/ccc/ddd/ccp10_scripts/cfg/lib]$ svn pl- v