1

今天遇到了一个很奇怪的问题，我做了一个svn从branch到trunk的合并，merging的输出如下，可以看到，文件'sncpStateInd.cfg'被merging删除了，但是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
4

0 回答 0