Description Sarah Gerweck 2011-08-18 17:18:40 EDT

Trying to edit conflicts. I seem to get SVN errors a lot so I hope we'll get a patch soon.

Version:	0.7.9.I20110523-1700

SVN Client:	org.eclipse.team.svn.connector.svnkit16 2.2.2.I20110523-1700 SVN/1.6.15 SVNKit/1.3.5 (http://svnkit.com/) r7406

JVM Properties:
{java.runtime.name=Java(TM) SE Runtime Environment, java.runtime.version=1.6.0_26-b03-383-11A511, java.vendor=Apple Inc., line.separator= , java.class.version=50.0, os.name=Mac OS X, os.arch=x86_64, user.country=US, os.version=10.7.1, eclipse.commands=-os macosx -ws cocoa -arch x86_64 -showsplash -launcher /Applications/Eclipse/Eclipse.app/Contents/MacOS/eclipse -name Eclipse --launcher.library /Applications/Eclipse/Eclipse.app/Contents/MacOS//../../../plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_1.1.100.v20110502/eclipse_1406.so -startup /Applications/Eclipse/Eclipse.app/Contents/MacOS//../../../plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -product org.eclipse.epp.package.jee.product -keyring /Users/gerweck/.eclipse_keyring -showlocation -vm /System/Library/Frameworks/JavaVM.framework , java.version=1.6.0_26, osgi.framework.version=3.7.0.v20110613, file.separator=/, java.vm.info=mixed mode, path.separator=:, user.timezone=America/Los_Angeles, user.language=en, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=MacRoman}

java.lang.NullPointerException
java.lang.NullPointerException
	at org.eclipse.compare.CompareEditorInput.setDirty(CompareEditorInput.java:1088)
	at org.eclipse.team.svn.ui.compare.ConflictingFileEditorInput.prepareInput(ConflictingFileEditorInput.java:87)
	at org.eclipse.compare.CompareEditorInput.run(CompareEditorInput.java:484)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.openEclipseEditor(ShowConflictEditorOperation.java:158)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.showEditorFor(ShowConflictEditorOperation.java:135)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation$1.run(ShowConflictEditorOperation.java:94)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:118)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:154)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:149)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.runImpl(ShowConflictEditorOperation.java:92)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81)
	at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:39)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:90)
	at org.eclipse.team.svn.ui.utility.WorkspaceModifyCancellableOperationWrapper.execute(WorkspaceModifyCancellableOperationWrapper.java:58)
	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.eclipse.team.svn.ui.utility.SVNTeamOperationWrapper.run(SVNTeamOperationWrapper.java:35)
	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:54)