Description Mark Pohl 2012-02-08 09:20:25 EST

Version:	0.7.9.I20111123-1700

SVN Client:	org.eclipse.team.svn.connector.svnkit15 2.2.2.I20111119-1700 SVN/1.5.6 SVNKit/1.2.3 (http://svnkit.com/) r5745

JVM Properties:
{java.runtime.name=Java(TM) SE Runtime Environment, java.runtime.version=1.6.0_29-b11, java.vendor=Sun Microsystems Inc., line.separator=
 , java.class.version=50.0, os.name=Windows 7, os.arch=x86, user.country=US, os.version=6.1, eclipse.commands=-os win32 -ws win32 -arch x86 -showsplash C:\eclipse_reinstall\\plugins\org.eclipse.platform_3.6.2.v201102101200\splash.bmp -launcher C:\eclipse_reinstall\eclipse.exe -name Eclipse --launcher.library C:\eclipse_reinstall\\plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.1.2.R36x_v20101222\eclipse_1312.dll -startup C:\eclipse_reinstall\\plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar -product org.eclipse.epp.package.jee.product -vm C:\Program Files (x86)\Java\jre6\bin\client\jvm.dll , java.version=1.6.0_29, osgi.framework.version=3.6.2.R36x_v20110210, file.separator=\, java.vm.info=mixed mode, sharing, path.separator=;, user.timezone=America/New_York, user.language=en, java.vm.name=Java HotSpot(TM) Client VM, file.encoding=Cp1252}

java.lang.NullPointerException
java.lang.NullPointerException
	at org.eclipse.team.svn.ui.panel.local.EditTreeConflictsPanel.createConflictInfoControls(EditTreeConflictsPanel.java:125)
	at org.eclipse.team.svn.ui.panel.local.EditTreeConflictsPanel.createControlsImpl(EditTreeConflictsPanel.java:72)
	at org.eclipse.team.svn.ui.panel.AbstractDialogPanel.createControls(AbstractDialogPanel.java:114)
	at org.eclipse.team.svn.ui.dialog.DefaultDialog.createMainPanel(DefaultDialog.java:329)
	at org.eclipse.team.svn.ui.dialog.DefaultDialog.createContents(DefaultDialog.java:190)
	at org.eclipse.jface.window.Window.create(Window.java:431)
	at org.eclipse.jface.dialogs.Dialog.create(Dialog.java:1089)
	at org.eclipse.team.svn.ui.dialog.DefaultDialog.create(DefaultDialog.java:218)
	at org.eclipse.jface.window.Window.open(Window.java:790)
	at org.eclipse.jface.dialogs.MessageDialog.open(MessageDialog.java:334)
	at org.eclipse.team.svn.ui.dialog.DefaultDialog.open(DefaultDialog.java:131)
	at org.eclipse.team.svn.ui.action.local.EditTreeConflictsAction.runImpl(EditTreeConflictsAction.java:42)
	at org.eclipse.team.svn.ui.action.AbstractSVNTeamAction$2.runImpl(AbstractSVNTeamAction.java:89)
	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.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:81)
	at org.eclipse.team.svn.ui.action.AbstractSVNTeamAction.execute(AbstractSVNTeamAction.java:82)
	at org.eclipse.team.internal.ui.actions.TeamAction.run(TeamAction.java:515)
	at org.eclipse.team.internal.ui.actions.TeamAction.runWithEvent(TeamAction.java:549)
	at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginAction.java:241)
	at org.eclipse.jface.action.ActionContributionItem.handleWidgetSelection(ActionContributionItem.java:584)
	at org.eclipse.jface.action.ActionContributionItem.access$2(ActionContributionItem.java:501)
	at org.eclipse.jface.action.ActionContributionItem$5.handleEvent(ActionContributionItem.java:411)
	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1053)
	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4066)
	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3657)
	at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2640)
	at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2604)
	at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2438)
	at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:671)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:664)
	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:115)
	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:369)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
	at java.lang.reflect.Method.invoke(Unknown Source)
	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:620)
	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:575)
	at org.eclipse.equinox.launcher.Main.run(Main.java:1408)