[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Subclipse-users] Svn 1.5 Merge support

From: Adam Carbone <acarbone_at_industrialdefender.com>
Date: Mon, 24 Nov 2008 17:28:23 -0500

Hello all,
    Is there any plans to support merging in subclipse? I understand
that the collabnet desktop has a merge client that they offer in there
open source desktop. But the problem with this is that it lags the
subclipse stuff it uses it's own version numbering which masks what
version of subclipse it is using and makes it difficult to find out what
issues are fixed and solved. I have been using subclipse for quite some
time... but if the merge features are continued to be separate from the
svn client then I might have to revisit subversive for ease of use... I
don't want to have to install alot of extra stuff that I don't need. And
have it mask errors that happen. This is what started all my
frustration, I got this on the commit dialog when ever I try to choose a
previous comment. and it crashes eclipse.

Please develop a merge client that is part of the Subclipse client, I
don't want to go to subversive.... but if it is easier that is the way
the company will go.

!ENTRY org.eclipse.ui 4 0 2008-11-19 09:12:31.546
!MESSAGE Unhandled event loop exception
!STACK 0
org.eclipse.swt.SWTException: Failed to execute runnable
(java.lang.NullPointerException)
    at org.eclipse.swt.SWT.error(SWT.java:3777)
    at org.eclipse.swt.SWT.error(SWT.java:3695)
    at
org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:136)
    at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3378)
    at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3036)
    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(NativeMethodAccessorImpl.java:39)
    at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
    at java.lang.reflect.Method.invoke(Method.java:597)
    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)
Caused by: java.lang.NullPointerException
    at
com.collabnet.subversion.merge.MergeOutput.equals(MergeOutput.java:181)
    at
org.eclipse.jface.viewers.StructuredViewer.equals(StructuredViewer.java:684)
    at
org.eclipse.jface.viewers.AbstractTreeViewer.updateChildren(AbstractTreeViewer.java:2641)
    at
org.eclipse.jface.viewers.AbstractTreeViewer.internalRefreshStruct(AbstractTreeViewer.java:1856)
    at
org.eclipse.jface.viewers.TreeViewer.internalRefreshStruct(TreeViewer.java:711)
    at
org.eclipse.jface.viewers.AbstractTreeViewer.internalRefresh(AbstractTreeViewer.java:1831)
    at
org.eclipse.jface.viewers.AbstractTreeViewer.internalRefresh(AbstractTreeViewer.java:1787)
    at
org.eclipse.jface.viewers.AbstractTreeViewer.internalRefresh(AbstractTreeViewer.java:1773)
    at
org.eclipse.jface.viewers.StructuredViewer$7.run(StructuredViewer.java:1430)
    at
org.eclipse.jface.viewers.StructuredViewer.preservingSelection(StructuredViewer.java:1365)
    at
org.eclipse.jface.viewers.TreeViewer.preservingSelection(TreeViewer.java:397)
    at
org.eclipse.jface.viewers.StructuredViewer.preservingSelection(StructuredViewer.java:1328)
    at
org.eclipse.jface.viewers.StructuredViewer.refresh(StructuredViewer.java:1428)
    at org.eclipse.jface.viewers.ColumnViewer.refresh(ColumnViewer.java:537)
    at
org.eclipse.jface.viewers.StructuredViewer.refresh(StructuredViewer.java:1387)
    at
com.collabnet.subversion.merge.views.MergeResultsView.refresh(MergeResultsView.java:304)
    at
com.collabnet.subversion.merge.views.MergeResultsView$9.run(MergeResultsView.java:313)
    at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35)
    at
org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:133)
    ... 22 more

!ENTRY org.eclipse.ui 4 0 2008-11-19 17:10:18.075
!MESSAGE Unhandled event loop exception
!STACK 0
org.eclipse.swt.SWTException: Widget is disposed
    at org.eclipse.swt.SWT.error(SWT.java:3777)
    at org.eclipse.swt.SWT.error(SWT.java:3695)
    at org.eclipse.swt.SWT.error(SWT.java:3666)
    at org.eclipse.swt.widgets.Widget.error(Widget.java:446)
    at org.eclipse.swt.widgets.Widget.checkWidget(Widget.java:384)
    at org.eclipse.swt.widgets.Control.getAccessible(Control.java:602)
    at
org.eclipse.ui.forms.widgets.AbstractHyperlink.triggerAccessible(AbstractHyperlink.java:235)
    at
org.eclipse.ui.forms.widgets.AbstractHyperlink.handleActivate(AbstractHyperlink.java:231)
    at
org.eclipse.ui.forms.widgets.AbstractHyperlink.handleMouseUp(AbstractHyperlink.java:320)
    at
org.eclipse.ui.forms.widgets.AbstractHyperlink.access$2(AbstractHyperlink.java:304)
    at
org.eclipse.ui.forms.widgets.AbstractHyperlink$4.handleEvent(AbstractHyperlink.java:119)
    at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
    at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1158)
    at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3401)
    at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3033)
    at org.eclipse.jface.window.Window.runEventLoop(Window.java:825)
    at org.eclipse.jface.window.Window.open(Window.java:801)
    at
com.collabnet.subversion.merge.actions.MergeAction.execute(MergeAction.java:27)
    at
org.tigris.subversion.subclipse.ui.actions.ConfigurableMergeAction.execute(ConfigurableMergeAction.java:27)
    at
org.tigris.subversion.subclipse.ui.actions.SVNAction.run(SVNAction.java:56)
    at
org.eclipse.ui.actions.ActionDelegate.runWithEvent(ActionDelegate.java:70)
    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:1158)
    at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3401)
    at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3033)
    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(NativeMethodAccessorImpl.java:39)
    at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
    at java.lang.reflect.Method.invoke(Method.java:597)
    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)

-- 
Regards,
Adam Carbone
Software Engineer 	Industrial Defender - Cyber Risk Protection? 
<http://www.industrialdefender.com/>
acarbone_at_industrialdefender.com
T: +1 (508)718-6700
F: +1 (508)718-6701
	Industrial Defender, Inc.
16 Chestnut St.
Foxborough, MA 02035
Copyright 2008 Industrial Defender Inc. owns copyright content of this 
document and all attachments unless otherwise indicated. All rights 
reserved. Users of Industrial Defender Inc. software and tools 
associated with the software such as sales & marketing collateral, 
presentations, user manuals, training documentation etc. may not 
republish nor reproduce in whole or in part the information, in any form 
or by any means, in any manner whatsoever without the prior written 
permission of Industrial Defender Inc., and any such unauthorized use 
constitutes copyright infringement. An acknowledgment of the source must 
be included whenever Industrial Defender Inc. material is copied or 
published. If you require further information on a permitted use or 
license to reproduce or republish any material, address your inquiry to 
Industrial Defender Inc. 16 Chestnut Street, Suite 300, Foxborough, 
Massachusetts, 02035. Any infringement of Industrial Defender Inc. 
rights will result in appropriate legal action. Industrial Defender Inc. 
disclaims any and all liability for any consequences which may result 
from any unauthorized reproduction or use of this Work whatsoever. 
www.industrialdefender.com www.industrialdefender.com 
<http://www.industrialdefender.com/>
Received on 2008-11-24 23:30:47 CET

This is an archived mail posted to the Subclipse Users mailing list.