eclipse/RAD/CVSNT团队更新错误

Question

在从eclipse/RAD执行Team-> Update时，我得到了以下错误。你知道我该怎么解决这个问题吗？

cvs update -l -d -P "/Boss/ejbModule/com/arch/boss/dao/BossDeviceDAO.java" "/Boss/ejbModule/com/arch/boss/dao/BossDeviceDAO.java"
    U ejbModule/com/arch/boss/dao/BossDeviceDAO.java
    cvs server: nonmergeable file needs merge
    cvs server: revision 1.17 from repository is now in ejbModule/com/arch/boss/dao/BossDeviceDAO.java
    cvs server: file from working directory is now in .#BossDeviceDAO.java.1.16
    C ejbModule/com/arch/boss/dao/BossDeviceDAO.java
ok (took 0:21.461)
Error: The following warnings were reported while performing the "cvs update" command.
   Error: Boss: An unmergable conflict has occurred for binary file /Boss/ejbModule/com/arch/boss/dao/BossDeviceDAO.java. Revision 1.17 has been loaded and overwritten local changes have been saved in file /Boss/ejbModule/com/arch/boss/dao/.#BossDeviceDAO.java.1.16
***

Answer 1

我看到在CVS文件夹中，条目文件包含我试图用1.6版本更新的文件的条目。但在CVS存储库中，最新版本是1.7。我对我的本地版本和存储库中的1.7版本的源代码进行了比较，发现我有最新的版本。因此，我使用记事本并手动将条目更新到1.7版，问题就解决了。