Community
Participate
Working Groups
To reproduce: Select a project > Team > Merge. In merge dialog change "Revisions:" radio group from "Start of copy" to "Revisions:". Upon changing the radio the error listed below displays in the Eclipse Error Log. If a revision is selected and the merge is accepted nothing is found to be merged (even though there is something to merge). Steps leading to bug: SVN server was upgraded from 1.4 to 1.5. Subversive was then updated to support 1.5 (I believe we were on 0.7.4.I20081001-1900, and 2.0.4.I20081001-1900 before the updated). The error was encountered upon trying to merge for the first time. The other programmers on my team see the same error. Versions: Subversive SVN Connectors: 2.0.5.I20081024-1200 Subversive SVN JDT Ignore Extensions: 0.7.5.I20081029-1900 Subversive SVN Team Provider: 0.7.5.I20081029-1900 JavaHL 1.5.3 Win32 Binaries: 2.0.5.I20081024-1200 -- Error Details -- Date: Thu Nov 20 08:55:45 EST 2008 Message: Unhandled event loop exception Severity: Error Plugin: org.eclipse.ui Session Data: eclipse.buildId=M20080911-1700 java.version=1.6.0 java.vendor=Sun Microsystems Inc. BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=en_US Framework arguments: 256M Command-line arguments: -os win32 -ws win32 -arch x86 256M Exception Stack Trace: java.lang.NullPointerException at org.eclipse.team.svn.ui.composite.RevisionComposite$8.widgetSelected(RevisionComposite.java:356) at org.eclipse.swt.widgets.TypedListener.handleEvent(TypedListener.java:228) at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84) at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1003) at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3823) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3422) at org.eclipse.jface.window.Window.runEventLoop(Window.java:825) at org.eclipse.jface.window.Window.open(Window.java:801) at org.eclipse.team.svn.ui.dialog.DefaultDialog.open(DefaultDialog.java:131) at org.eclipse.team.svn.ui.action.local.MergeAction.runImpl(MergeAction.java:65) at org.eclipse.team.svn.ui.action.AbstractSVNTeamAction$2.runImpl(AbstractSVNTeamAction.java:82) at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:76) at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:37) at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:103) at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:89) at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:80) at org.eclipse.team.svn.ui.action.AbstractSVNTeamAction.execute(AbstractSVNTeamAction.java:75) at org.eclipse.team.internal.ui.actions.TeamAction.run(TeamAction.java:514) at org.eclipse.team.internal.ui.actions.TeamAction.runWithEvent(TeamAction.java:548) at org.eclipse.ui.internal.PluginAction.runWithEvent(PluginAction.java:241) at org.eclipse.jface.action.ActionContributionItem.handleWidgetSelection(ActionContributionItem.java:583) at org.eclipse.jface.action.ActionContributionItem.access$2(ActionContributionItem.java:500) 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:1003) at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3823) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3422) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2382) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2346) at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2198) at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:493) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:288) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:488) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:113) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:193) 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:386) 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:549) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:504) at org.eclipse.equinox.launcher.Main.run(Main.java:1236)
Also, it looks like merging works if the "Revisions:" radio group isn't changed from the default option of "Start from copy".
I just uninstalled the "update-site" version of subversive and installed the versions from the "weekly-site" update site and encountered the same error and inability to merge. The versions I installed and used: Subversive SVN Connectors: 2.0.4.I20081001-1900 Subversive SVN JDT Ignore Extensions: 0.7.4.I20081001-1900 Subversive SVN Team Provider: 0.7.4.I20081003-1900 JavaHL 1.5.3 Win32 Binaries: 2.0.4.I20081001-1900 Is there a known workaround (or am I just doing something wrong)?
Same problem on Ubuntu 8.10 x86_64 using IBM Java 5, eclipse 3.4.1 and subclipse 0.7.5.I20081029-1900.
Fixed NPE. If you still experience problem with second part of the description ("If a revision is selected and the merge is accepted nothing is found to be merged (even though there is something to merge)", please, let us know.
