Hallo
folgende Situation: ich habe einen Zweig (branch) erzeugt (Payment) in dem ich arbeite, mein Kollege hat unterdessen im Head weitergearbeitet. Nun will ich meinen Zweig mit dem Head mergen und bekomme immer folgende Message:
Problems reported while synchronizing CVS Merge 'Root\_Payment to HEAD'. 0 of 1 resources were synchronized.
An error occurred synchronizing /SBWaschanlage: Error fetching file revisions
org.eclipse.team.internal.ccvs.core.CVSException: Error fetching file revisions
org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder.fetchFileRevisions(RemoteFolderTreeBuilder.java:729)
org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder.fetchFileRevisions(RemoteFolderTreeBuilder.java:283)
org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder.buildTree(RemoteFolderTreeBuilder.java:196)
org.eclipse.team.internal.ccvs.core.resources.FileContentCachingService.buildRemoteTree(FileContentCachingService.java:45)
org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot.getRemoteTree(CVSWorkspaceRoot.java:228)
org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree.fetchVariant(CVSResourceVariantTree.java:100)
org.eclipse.team.core.variants.AbstractResourceVariantTree.refresh(AbstractResourceVariantTree.java:94)
org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree.refresh(CVSResourceVariantTree.java:303)
org.eclipse.team.core.variants.AbstractResourceVariantTree.refresh(AbstractResourceVariantTree.java:63)
org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber$MergeBaseTree.refresh(CVSMergeSubscriber.java:66)
org.eclipse.team.core.variants.ResourceVariantTreeSubscriber.refresh(ResourceVariantTreeSubscriber.java:155)
org.eclipse.team.core.variants.ResourceVariantTreeSubscriber.refresh(ResourceVariantTreeSubscriber.java:123)
org.eclipse.team.internal.ui.synchronize.RefreshSubscriberJob.run(RefreshSubscriberJob.java:279)
org.eclipse.core.internal.jobs.Worker.run(Worker.java:66)
Problems reported while synchronizing CVS Merge 'Root\_Payment to HEAD'. 0 of 1 resources were synchronized.
An error occurred synchronizing /SBWaschanlage: Error fetching file revisions
org.eclipse.team.internal.ccvs.core.CVSException: Error fetching file revisions
org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder.fetchFileRevisions(RemoteFolderTreeBuilder.java:729)
org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder.fetchFileRevisions(RemoteFolderTreeBuilder.java:283)
org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTreeBuilder.buildTree(RemoteFolderTreeBuilder.java:196)
org.eclipse.team.internal.ccvs.core.resources.FileContentCachingService.buildRemoteTree(FileContentCachingService.java:45)
org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot.getRemoteTree(CVSWorkspaceRoot.java:228)
org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree.fetchVariant(CVSResourceVariantTree.java:100)
org.eclipse.team.core.variants.AbstractResourceVariantTree.refresh(AbstractResourceVariantTree.java:94)
org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree.refresh(CVSResourceVariantTree.java:303)
org.eclipse.team.core.variants.AbstractResourceVariantTree.refresh(AbstractResourceVariantTree.java:63)
org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber$MergeBaseTree.refresh(CVSMergeSubscriber.java:66)
org.eclipse.team.core.variants.ResourceVariantTreeSubscriber.refresh(ResourceVariantTreeSubscriber.java:155)
org.eclipse.team.core.variants.ResourceVariantTreeSubscriber.refresh(ResourceVariantTreeSubscriber.java:123)
org.eclipse.team.internal.ui.synchronize.RefreshSubscriberJob.run(RefreshSubscriberJob.java:279)
org.eclipse.core.internal.jobs.Worker.run(Worker.java:66)
Ebenso bemerkte ich, dass ich unter Show Ressource History keine Angaben mehr bekommen, aber ich kann verschiedene Versionen immer noch verlgeichen.
Ich habe schon mehrere merge-Versuche gestartet (mit allen Varianten =) ) und mit Hilfe von Tutorials usw.
Bentutzt wird eben Eclipse 3.0 (wobei mein Partner eine zeitlang noch Eclipse 2.1 benutzte) mit cvsnt (mittels pserver type).
