Connecting to: godel:pserver !SESSION 2007-10-23 21:35:17.743 ----------------------------------------------- eclipse.buildId=M20071023-1652 java.version=1.4.2_14 java.vendor=Sun Microsystems Inc. BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US Framework arguments: -application org.eclipse.test.uitestapplication formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,/buildtest/M20071023-1652/eclipse-testing/test-eclipse/eclipse/org.eclipse.team.tests.ccvs.core.AllTests.xml -testPluginName org.eclipse.team.tests.cvs.core -className org.eclipse.team.tests.ccvs.core.AllTests Command-line arguments: -application org.eclipse.test.uitestapplication -data /buildtest/M20071023-1652/eclipse-testing/test-eclipse/eclipse/cvs_sniff_folder formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,/buildtest/M20071023-1652/eclipse-testing/test-eclipse/eclipse/org.eclipse.team.tests.ccvs.core.AllTests.xml -testPluginName org.eclipse.team.tests.cvs.core -className org.eclipse.team.tests.ccvs.core.AllTests -os linux -ws gtk -arch x86 -consolelog !ENTRY org.eclipse.team.core 4 0 2007-10-23 21:38:11.463 !MESSAGE Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. !STACK 1 org.eclipse.team.core.TeamException: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. at org.eclipse.team.core.TeamException.asTeamException(TeamException.java:112) at org.eclipse.team.internal.core.subscribers.ContentComparator.getContents(ContentComparator.java:143) at org.eclipse.team.internal.core.subscribers.ContentComparator.compare(ContentComparator.java:40) at org.eclipse.team.core.synchronize.SyncInfoFilter$ContentComparisonSyncInfoFilter.compareContents(SyncInfoFilter.java:81) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation$1.run(CacheBaseContentsOperation.java:112) at org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer.run(EclipseSynchronizer.java:1463) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource$2.run(EclipseResource.java:262) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource.run(EclipseResource.java:259) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.performCleanTimestamps(CacheBaseContentsOperation.java:105) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.execute(CacheBaseContentsOperation.java:74) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:280) at org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation.execute(SingleCommandOperation.java:66) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:256) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:210) at org.eclipse.team.internal.ccvs.ui.operations.CVSOperation.run(CVSOperation.java:81) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext.cacheContents(WorkspaceSubscriberContext.java:364) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext$3.run(WorkspaceSubscriberContext.java:308) at org.eclipse.team.internal.core.BackgroundEventHandler$RunnableEvent.run(BackgroundEventHandler.java:176) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.executeRunnable(SubscriberEventHandler.java:364) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.processEvent(SubscriberEventHandler.java:304) at org.eclipse.team.internal.core.BackgroundEventHandler.processEvents(BackgroundEventHandler.java:369) at org.eclipse.team.internal.core.BackgroundEventHandler$1.run(BackgroundEventHandler.java:203) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) org.eclipse.team.core.TeamException[274]: org.eclipse.core.internal.resources.ResourceException: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:610) at org.eclipse.core.internal.resources.File.getContents(File.java:287) at org.eclipse.core.internal.resources.File.getContents(File.java:276) at org.eclipse.team.internal.core.subscribers.ContentComparator.getContents(ContentComparator.java:131) at org.eclipse.team.internal.core.subscribers.ContentComparator.compare(ContentComparator.java:40) at org.eclipse.team.core.synchronize.SyncInfoFilter$ContentComparisonSyncInfoFilter.compareContents(SyncInfoFilter.java:81) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation$1.run(CacheBaseContentsOperation.java:112) at org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer.run(EclipseSynchronizer.java:1463) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource$2.run(EclipseResource.java:262) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource.run(EclipseResource.java:259) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.performCleanTimestamps(CacheBaseContentsOperation.java:105) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.execute(CacheBaseContentsOperation.java:74) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:280) at org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation.execute(SingleCommandOperation.java:66) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:256) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:210) at org.eclipse.team.internal.ccvs.ui.operations.CVSOperation.run(CVSOperation.java:81) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext.cacheContents(WorkspaceSubscriberContext.java:364) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext$3.run(WorkspaceSubscriberContext.java:308) at org.eclipse.team.internal.core.BackgroundEventHandler$RunnableEvent.run(BackgroundEventHandler.java:176) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.executeRunnable(SubscriberEventHandler.java:364) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.processEvent(SubscriberEventHandler.java:304) at org.eclipse.team.internal.core.BackgroundEventHandler.processEvents(BackgroundEventHandler.java:369) at org.eclipse.team.internal.core.BackgroundEventHandler$1.run(BackgroundEventHandler.java:203) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 1 org.eclipse.core.resources 4 274 2007-10-23 21:38:11.466 !MESSAGE Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. !STACK 1 org.eclipse.core.internal.resources.ResourceException: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:610) at org.eclipse.core.internal.resources.File.getContents(File.java:287) at org.eclipse.core.internal.resources.File.getContents(File.java:276) at org.eclipse.team.internal.core.subscribers.ContentComparator.getContents(ContentComparator.java:131) at org.eclipse.team.internal.core.subscribers.ContentComparator.compare(ContentComparator.java:40) at org.eclipse.team.core.synchronize.SyncInfoFilter$ContentComparisonSyncInfoFilter.compareContents(SyncInfoFilter.java:81) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation$1.run(CacheBaseContentsOperation.java:112) at org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer.run(EclipseSynchronizer.java:1463) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource$2.run(EclipseResource.java:262) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource.run(EclipseResource.java:259) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.performCleanTimestamps(CacheBaseContentsOperation.java:105) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.execute(CacheBaseContentsOperation.java:74) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:280) at org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation.execute(SingleCommandOperation.java:66) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:256) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:210) at org.eclipse.team.internal.ccvs.ui.operations.CVSOperation.run(CVSOperation.java:81) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext.cacheContents(WorkspaceSubscriberContext.java:364) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext$3.run(WorkspaceSubscriberContext.java:308) at org.eclipse.team.internal.core.BackgroundEventHandler$RunnableEvent.run(BackgroundEventHandler.java:176) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.executeRunnable(SubscriberEventHandler.java:364) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.processEvent(SubscriberEventHandler.java:304) at org.eclipse.team.internal.core.BackgroundEventHandler.processEvents(BackgroundEventHandler.java:369) at org.eclipse.team.internal.core.BackgroundEventHandler$1.run(BackgroundEventHandler.java:203) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 2 org.eclipse.core.resources 4 274 2007-10-23 21:38:11.467 !MESSAGE Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. Severity: 4 Plugin ID: org.eclipse.team.core Code: 0 Message: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. org.eclipse.team.core.TeamException: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. at org.eclipse.team.core.TeamException.asTeamException(TeamException.java:112) at org.eclipse.team.internal.core.subscribers.ContentComparator.getContents(ContentComparator.java:143) at org.eclipse.team.internal.core.subscribers.ContentComparator.compare(ContentComparator.java:40) at org.eclipse.team.core.synchronize.SyncInfoFilter$ContentComparisonSyncInfoFilter.compareContents(SyncInfoFilter.java:81) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation$1.run(CacheBaseContentsOperation.java:112) at org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer.run(EclipseSynchronizer.java:1463) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource$2.run(EclipseResource.java:262) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource.run(EclipseResource.java:259) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.performCleanTimestamps(CacheBaseContentsOperation.java:105) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.execute(CacheBaseContentsOperation.java:74) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:280) at org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation.execute(SingleCommandOperation.java:66) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:256) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:210) at org.eclipse.team.internal.ccvs.ui.operations.CVSOperation.run(CVSOperation.java:81) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext.cacheContents(WorkspaceSubscriberContext.java:364) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext$3.run(WorkspaceSubscriberContext.java:308) at org.eclipse.team.internal.core.BackgroundEventHandler$RunnableEvent.run(BackgroundEventHandler.java:176) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.executeRunnable(SubscriberEventHandler.java:364) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.processEvent(SubscriberEventHandler.java:304) at org.eclipse.team.internal.core.BackgroundEventHandler.processEvents(BackgroundEventHandler.java:369) at org.eclipse.team.internal.core.BackgroundEventHandler$1.run(BackgroundEventHandler.java:203) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) org.eclipse.team.core.TeamException[274]: org.eclipse.core.internal.resources.ResourceException: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:610) at org.eclipse.core.internal.resources.File.getContents(File.java:287) at org.eclipse.core.internal.resources.File.getContents(File.java:276) at org.eclipse.team.internal.core.subscribers.ContentComparator.getContents(ContentComparator.java:131) at org.eclipse.team.internal.core.subscribers.ContentComparator.compare(ContentComparator.java:40) at org.eclipse.team.core.synchronize.SyncInfoFilter$ContentComparisonSyncInfoFilter.compareContents(SyncInfoFilter.java:81) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation$1.run(CacheBaseContentsOperation.java:112) at org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer.run(EclipseSynchronizer.java:1463) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource$2.run(EclipseResource.java:262) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource.run(EclipseResource.java:259) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.performCleanTimestamps(CacheBaseContentsOperation.java:105) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.execute(CacheBaseContentsOperation.java:74) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:280) at org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation.execute(SingleCommandOperation.java:66) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:256) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:210) at org.eclipse.team.internal.ccvs.ui.operations.CVSOperation.run(CVSOperation.java:81) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext.cacheContents(WorkspaceSubscriberContext.java:364) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext$3.run(WorkspaceSubscriberContext.java:308) at org.eclipse.team.internal.core.BackgroundEventHandler$RunnableEvent.run(BackgroundEventHandler.java:176) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.executeRunnable(SubscriberEventHandler.java:364) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.processEvent(SubscriberEventHandler.java:304) at org.eclipse.team.internal.core.BackgroundEventHandler.processEvents(BackgroundEventHandler.java:369) at org.eclipse.team.internal.core.BackgroundEventHandler$1.run(BackgroundEventHandler.java:203) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.core.resources Code: 274 Message: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. org.eclipse.core.internal.resources.ResourceException: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:610) at org.eclipse.core.internal.resources.File.getContents(File.java:287) at org.eclipse.core.internal.resources.File.getContents(File.java:276) at org.eclipse.team.internal.core.subscribers.ContentComparator.getContents(ContentComparator.java:131) at org.eclipse.team.internal.core.subscribers.ContentComparator.compare(ContentComparator.java:40) at org.eclipse.team.core.synchronize.SyncInfoFilter$ContentComparisonSyncInfoFilter.compareContents(SyncInfoFilter.java:81) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation$1.run(CacheBaseContentsOperation.java:112) at org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer.run(EclipseSynchronizer.java:1463) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource$2.run(EclipseResource.java:262) at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797) at org.eclipse.team.internal.ccvs.core.resources.EclipseResource.run(EclipseResource.java:259) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.performCleanTimestamps(CacheBaseContentsOperation.java:105) at org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation.execute(CacheBaseContentsOperation.java:74) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:280) at org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation.execute(SingleCommandOperation.java:66) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:256) at org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:210) at org.eclipse.team.internal.ccvs.ui.operations.CVSOperation.run(CVSOperation.java:81) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext.cacheContents(WorkspaceSubscriberContext.java:364) at org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext$3.run(WorkspaceSubscriberContext.java:308) at org.eclipse.team.internal.core.BackgroundEventHandler$RunnableEvent.run(BackgroundEventHandler.java:176) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.executeRunnable(SubscriberEventHandler.java:364) at org.eclipse.team.internal.core.subscribers.SubscriberEventHandler.processEvent(SubscriberEventHandler.java:304) at org.eclipse.team.internal.core.BackgroundEventHandler.processEvents(BackgroundEventHandler.java:369) at org.eclipse.team.internal.core.BackgroundEventHandler$1.run(BackgroundEventHandler.java:203) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.core.resources Code: 274 Message: Resource is out of sync with the file system: '/testFolderAdditionHandling-1193189887690/changed.txt'. !ENTRY org.eclipse.team.core 4 -6 2007-10-23 21:40:19.032 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !STACK 1 org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 1 org.eclipse.team.core 4 1 2007-10-23 21:40:19.033 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. Severity: 4 Plugin ID: org.eclipse.team.core Code: -6 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.team.core Code: 1 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !ENTRY org.eclipse.team.cvs.core 4 4 2007-10-23 21:40:26.287 !MESSAGE The state of /testLocalScrub-1193190020472/delete.txt has been changed concurrently. Severity: 4 Plugin ID: org.eclipse.team.cvs.core Code: 4 Message: The state of /testLocalScrub-1193190020472/delete.txt has been changed concurrently. !ENTRY org.eclipse.team.core 4 -6 2007-10-23 21:42:47.942 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !STACK 1 org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 1 org.eclipse.team.core 4 1 2007-10-23 21:42:47.943 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. Severity: 4 Plugin ID: org.eclipse.team.core Code: -6 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.team.core Code: 1 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !ENTRY org.eclipse.team.core 4 -6 2007-10-23 21:43:33.695 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !STACK 1 org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 1 org.eclipse.team.core 4 1 2007-10-23 21:43:33.695 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. Severity: 4 Plugin ID: org.eclipse.team.core Code: -6 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.team.core Code: 1 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !ENTRY org.eclipse.team.core 4 -6 2007-10-23 21:43:52.011 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !STACK 1 org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 1 org.eclipse.team.core 4 1 2007-10-23 21:43:52.011 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. Severity: 4 Plugin ID: org.eclipse.team.core Code: -6 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.team.core Code: 1 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !ENTRY org.eclipse.team.core 4 -6 2007-10-23 21:47:12.746 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !STACK 1 org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) !SUBENTRY 1 org.eclipse.team.core 4 1 2007-10-23 21:47:12.746 !MESSAGE Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. Severity: 4 Plugin ID: org.eclipse.team.core Code: -6 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. org.eclipse.core.runtime.CoreException: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:60) at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:120) at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144) at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) Severity: 4 Plugin ID: org.eclipse.team.core Code: 1 Message: Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. !ENTRY org.eclipse.ui 4 0 2007-10-23 21:52:25.641 !MESSAGE Unable to create editor ID org.eclipse.team.tests.cvs.core.editor1: Input is not an IFileEditorInput !STACK 1 org.eclipse.ui.PartInitException: Input is not an IFileEditorInput at org.eclipse.team.tests.ccvs.ui.TestEditor.init(TestEditor.java:25) at org.eclipse.ui.internal.EditorManager.createSite(EditorManager.java:794) at org.eclipse.ui.internal.EditorReference.createPartHelper(EditorReference.java:643) at org.eclipse.ui.internal.EditorReference.createPart(EditorReference.java:426) at org.eclipse.ui.internal.WorkbenchPartReference.getPart(WorkbenchPartReference.java:592) at org.eclipse.ui.internal.EditorReference.getEditor(EditorReference.java:263) at org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched(WorkbenchPage.java:2739) at org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(WorkbenchPage.java:2651) at org.eclipse.ui.internal.WorkbenchPage.access$13(WorkbenchPage.java:2643) at org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.java:2595) at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator.java:67) at org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPage.java:2590) at org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPage.java:2574) at org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPage.java:2557) at org.eclipse.team.internal.ui.Utils.openEditor(Utils.java:983) at org.eclipse.team.internal.ui.Utils.openEditor(Utils.java:975) at org.eclipse.team.internal.ccvs.ui.CVSUIPlugin.openEditor(CVSUIPlugin.java:681) at org.eclipse.team.tests.ccvs.ui.EditorTests.testOpenEditorOnRevision(EditorTests.java:57) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:324) at junit.framework.TestCase.runTest(TestCase.java:164) at org.eclipse.team.tests.ccvs.core.EclipseTest.runTest(EclipseTest.java:1391) at junit.framework.TestCase.runBare(TestCase.java:130) at org.eclipse.team.tests.ccvs.core.EclipseTest.runBare(EclipseTest.java:1238) at junit.framework.TestResult$1.protect(TestResult.java:106) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.framework.TestResult.run(TestResult.java:109) at junit.framework.TestCase.run(TestCase.java:120) at junit.framework.TestSuite.runTest(TestSuite.java:230) at junit.framework.TestSuite.run(TestSuite.java:225) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.extensions.TestSetup.run(TestSetup.java:25) at junit.framework.TestSuite.runTest(TestSuite.java:230) at junit.framework.TestSuite.run(TestSuite.java:225) at junit.framework.TestSuite.runTest(TestSuite.java:230) at junit.framework.TestSuite.run(TestSuite.java:225) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.extensions.TestSetup.run(TestSetup.java:25) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:354) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:206) at org.eclipse.test.UITestApplication$3.run(UITestApplication.java:195) at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:123) at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3296) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:2974) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2389) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2353) at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2219) at org.eclipse.ui.internal.Workbench$4.run(Workbench.java:466) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:289) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:461) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:106) at org.eclipse.test.UITestApplication.runApplication(UITestApplication.java:138) at org.eclipse.test.UITestApplication.run(UITestApplication.java:60) at org.eclipse.test.UITestApplication.start(UITestApplication.java:210) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:169) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:106) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:76) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:363) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:176) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:324) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:508) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:447) at org.eclipse.equinox.launcher.Main.run(Main.java:1173) at org.eclipse.equinox.launcher.Main.main(Main.java:1148) at org.eclipse.core.launcher.Main.main(Main.java:30) !SUBENTRY 1 org.eclipse.ui 4 0 2007-10-23 21:52:25.643 !MESSAGE Input is not an IFileEditorInput Severity: 4 Plugin ID: org.eclipse.ui Code: 0 Message: Unable to create editor ID org.eclipse.team.tests.cvs.core.editor1: Input is not an IFileEditorInput org.eclipse.ui.PartInitException: Input is not an IFileEditorInput at org.eclipse.team.tests.ccvs.ui.TestEditor.init(TestEditor.java:25) at org.eclipse.ui.internal.EditorManager.createSite(EditorManager.java:794) at org.eclipse.ui.internal.EditorReference.createPartHelper(EditorReference.java:643) at org.eclipse.ui.internal.EditorReference.createPart(EditorReference.java:426) at org.eclipse.ui.internal.WorkbenchPartReference.getPart(WorkbenchPartReference.java:592) at org.eclipse.ui.internal.EditorReference.getEditor(EditorReference.java:263) at org.eclipse.ui.internal.WorkbenchPage.busyOpenEditorBatched(WorkbenchPage.java:2739) at org.eclipse.ui.internal.WorkbenchPage.busyOpenEditor(WorkbenchPage.java:2651) at org.eclipse.ui.internal.WorkbenchPage.access$13(WorkbenchPage.java:2643) at org.eclipse.ui.internal.WorkbenchPage$10.run(WorkbenchPage.java:2595) at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator.java:67) at org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPage.java:2590) at org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPage.java:2574) at org.eclipse.ui.internal.WorkbenchPage.openEditor(WorkbenchPage.java:2557) at org.eclipse.team.internal.ui.Utils.openEditor(Utils.java:983) at org.eclipse.team.internal.ui.Utils.openEditor(Utils.java:975) at org.eclipse.team.internal.ccvs.ui.CVSUIPlugin.openEditor(CVSUIPlugin.java:681) at org.eclipse.team.tests.ccvs.ui.EditorTests.testOpenEditorOnRevision(EditorTests.java:57) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:324) at junit.framework.TestCase.runTest(TestCase.java:164) at org.eclipse.team.tests.ccvs.core.EclipseTest.runTest(EclipseTest.java:1391) at junit.framework.TestCase.runBare(TestCase.java:130) at org.eclipse.team.tests.ccvs.core.EclipseTest.runBare(EclipseTest.java:1238) at junit.framework.TestResult$1.protect(TestResult.java:106) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.framework.TestResult.run(TestResult.java:109) at junit.framework.TestCase.run(TestCase.java:120) at junit.framework.TestSuite.runTest(TestSuite.java:230) at junit.framework.TestSuite.run(TestSuite.java:225) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.extensions.TestSetup.run(TestSetup.java:25) at junit.framework.TestSuite.runTest(TestSuite.java:230) at junit.framework.TestSuite.run(TestSuite.java:225) at junit.framework.TestSuite.runTest(TestSuite.java:230) at junit.framework.TestSuite.run(TestSuite.java:225) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.extensions.TestSetup.run(TestSetup.java:25) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:354) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:206) at org.eclipse.test.UITestApplication$3.run(UITestApplication.java:195) at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:123) at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3296) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:2974) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2389) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2353) at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2219) at org.eclipse.ui.internal.Workbench$4.run(Workbench.java:466) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:289) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:461) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:106) at org.eclipse.test.UITestApplication.runApplication(UITestApplication.java:138) at org.eclipse.test.UITestApplication.run(UITestApplication.java:60) at org.eclipse.test.UITestApplication.start(UITestApplication.java:210) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:169) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:106) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:76) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:363) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:176) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:324) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:508) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:447) at org.eclipse.equinox.launcher.Main.run(Main.java:1173) at org.eclipse.equinox.launcher.Main.main(Main.java:1148) at org.eclipse.core.launcher.Main.main(Main.java:30) Severity: 4 Plugin ID: org.eclipse.ui Code: 0 Message: Input is not an IFileEditorInput