当我在团队同步透视图中标记为'合并'文件时，会显示一个弹出窗口，它只显示：
“标记为合并”期间发生内部错误。 显示java.lang.NullPointerException
然后我的更改位于新文件* .tmp中，真实文件包含服务器版本。
您是否遇到过这种情况并以某种方式修复了它？
编辑：版本＆amp;栈跟踪
版本：
NPE的Stacktrace：
java.lang.NullPointerException
at org.tigris.subversion.subclipse.ui.operations.UpdateOperation.getSchedulingRule(UpdateOperation.java:129)
at org.tigris.subversion.subclipse.ui.operations.RepositoryProviderOperation.execute(RepositoryProviderOperation.java:70)
at org.tigris.subversion.subclipse.ui.operations.SVNOperation.run(SVNOperation.java:90)
at org.tigris.subversion.subclipse.ui.subscriber.MarkMergedSynchronizeOperation$1.execute(MarkMergedSynchronizeOperation.java:74)
at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118)
at org.tigris.subversion.subclipse.ui.repository.RepositoryManager.run(RepositoryManager.java:375)
at org.tigris.subversion.subclipse.ui.subscriber.MarkMergedSynchronizeOperation$3.run(MarkMergedSynchronizeOperation.java:153)
at org.tigris.subversion.subclipse.ui.subscriber.MarkMergedSynchronizeOperation$4.run(MarkMergedSynchronizeOperation.java:162)
at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator.java:52)
at org.tigris.subversion.subclipse.ui.subscriber.MarkMergedSynchronizeOperation.run(MarkMergedSynchronizeOperation.java:159)
at org.tigris.subversion.subclipse.ui.subscriber.MarkMergedSynchronizeOperation.run(MarkMergedSynchronizeOperation.java:56)
at org.tigris.subversion.subclipse.ui.subscriber.SVNSynchronizeOperation.run(SVNSynchronizeOperation.java:61)
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:53)
答案 0 :(得分：1)
这是Subclipse 1.8.19中的一个错误。
http://subclipse.tigris.org/issues/show_bug.cgi?id=1498
已在1.8.20版本中修复。因此，如果可能，请将您的Subclipse版本升级到最新版本，目前为1.8.22。