Community
Participate
Working Groups
Version: 1.0.0.I20130122-1700 SVN Client: org.eclipse.team.svn.connector.svnkit17 3.0.0.I20121013-1700 SVN/1.7.5 SVNKit/1.7.5-v1 (http://svnkit.com/) r9382_v20120718_1415 JVM Properties: {java.runtime.name=OpenJDK Runtime Environment, java.runtime.version=1.7.0_25-b30, java.vendor=Oracle Corporation, line.separator= , java.class.version=51.0, os.name=Linux, os.arch=amd64, user.country=US, os.version=3.8.0-35-generic, eclipse.commands=-os linux -ws gtk -arch x86_64 -showsplash -launcher /home/paul/android/eclipse/eclipse -name Eclipse --launcher.library /home/paul/android/eclipse//plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120913-144807/eclipse_1502.so -startup /home/paul/android/eclipse//plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar --launcher.overrideVmargs -exitdata 130000 -product com.android.ide.eclipse.adt.package.product -vm /usr/bin/java , java.version=1.7.0_25, osgi.framework.version=3.8.2.v20130124-134944, file.separator=/, java.vm.info=mixed mode, path.separator=:, user.timezone=Europe/Amsterdam, user.language=en, java.vm.name=OpenJDK 64-Bit Server VM, file.encoding=UTF-8} 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:1276) at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3562) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3186) at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$9.run(PartRenderingEngine.java:1053) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332) at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:942) at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:86) at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:588) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:543) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:124) 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:353) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:180) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:629) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:584) at org.eclipse.equinox.launcher.Main.run(Main.java:1438) at org.eclipse.equinox.launcher.Main.main(Main.java:1414)
Fixed.
