Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1641] New - Impossible to resolve tree conflicts when Eclipse contains invalid project with the same SVN path

subclipse
Discussion topic

Back to topic list

[Issue 1641] New - Impossible to resolve tree conflicts when Eclipse contains invalid project with the same SVN path

Author jiriklement
Full name Jiri Klement
Date 2016-01-04 08:33:39 PST
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1641
                 Issue #|1641
                 Summary|Impossible to resolve tree conflicts when Eclipse cont
                        |ains invalid project with the same SVN path
               Component|subclipse
                 Version|1.10.x
                Platform|All
              OS/Version|All
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|UI
             Assigned to|issues@subclipse
             Reported by|jiriklement






------- Additional comments from jiriklement at tigris dot org Mon Jan 4 08:33:39 -0800 2016 -------
It's not possible to resolve tree conflicts if there is an invalid project
pointing to the same svn path. In SVN tree conflicts view is shown path from
the invalid project and when trying to resolve conflict empty error dialog is
shown.

It's more my fault than Subclipse bug but Subclipse should react to the
situation better than showing error dialog without any message.

How to reproduce:
1) Make project which contains SVN root, name it 'everything'
2) Delete project 'everything' on disk (it remains in list of projects in
eclipse)
3) Create new project 'my-module' which contains only one module from the
repository and do svn merge which produce tree conflicts
4) Conflicted path is shown as /everything/..path to missing file instead of /
my-module/...
5) Open resolve dialog, no error is shown but in eclipse log is:
!ENTRY org.tigris.subversio​n.subclipse.core 2 0 2016-01-04 14:24:19.637
!MESSAGE Failed to get SVNTeamProvider for 'F/everything/trunk/...'

!ENTRY org.tigris.subversio​n.subclipse.ui 4 0 2016-01-04 14:24:19.640
!MESSAGE
!STACK 0
java.lang.NullPointerException
    at
org.tigris.subversio​n.subclipse.core.com​mands.GetRemoteResou​rceCommand.run
(GetRemoteResourceCo​mmand.java:57)
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ResolveTreeConf​lictWizardMainPage.g​
etRemoteResource(Res​olveTreeConflictWiza​rdMainPage.java:824)​
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ResolveTreeConf​lictWizardMainPage.c​
reateControl(Resolve​TreeConflictWizardMa​inPage.java:748)
    at org.eclipse.jface.wi​zard.Wizard.createPa​geControls(Wizard.ja​va:175)
    at org.eclipse.jface.wi​zard.WizardDialog.cr​eatePageControls
(WizardDialog.java:705)
    at org.eclipse.jface.wi​zard.WizardDialog.cr​eateContents
(WizardDialog.java:597)
    at org.eclipse.jface.wi​ndow.Window.create(W​indow.java:430)
    at org.eclipse.jface.di​alogs.Dialog.create(​Dialog.java:1096)
    at org.eclipse.jface.wi​ndow.Window.open(Win​dow.java:792)
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ResolveTreeConf​lictAction.run
(ResolveTreeConflict​Action.java:29)
    at org.eclipse.jface.ac​tion.Action.runWithE​vent(Action.java:473​)
    at org.eclipse.jface.ac​tion.ActionContribut​ionItem.handleWidget​Selection
(ActionContributionI​tem.java:595)
    at org.eclipse.jface.ac​tion.ActionContribut​ionItem.access
$2(ActionContributi​onItem.java:511)
    at org.eclipse.jface.ac​tion.ActionContribut​ionItem$5.handleEve​nt
(ActionContributionI​tem.java:420)
    at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
    at org.eclipse.swt.widg​ets.Display.sendEven​t(Display.java:4481)​
    at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1329)
    at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:3819)
    at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3430)
    at org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​$4.run
(PartRenderingEngine.java:1127)
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​
(Realm.java:337)
    at org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​.run
(PartRenderingEngine.java:1018)
    at org.eclipse.e4.ui.in​ternal.workbench.E4W​orkbench.createAndRu​nUI
(E4Workbench.java:156)
    at org.eclipse.ui.inter​nal.Workbench$5.run​(Workbench.java:654)​
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​
(Realm.java:337)
    at org.eclipse.ui.inter​nal.Workbench.create​AndRunWorkbench
(Workbench.java:598)
    at org.eclipse.ui.Platf​ormUI.createAndRunWo​rkbench(PlatformUI.j​ava:150)
    at org.eclipse.ui.inter​nal.ide.application.​IDEApplication.start​
(IDEApplication.java:139)
    at org.eclipse.equinox.​internal.app.Eclipse​AppHandle.run
(EclipseAppHandle.java:196)
    at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.runApplication
(EclipseAppLauncher.java:134)
    at org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.start
(EclipseAppLauncher.java:104)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run
(EclipseStarter.java:380)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run
(EclipseStarter.java:235)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke0(Native Method)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke
(NativeMethodAccesso​rImpl.java:57)
    at sun.reflect.Delegati​ngMethodAccessorImpl​.invoke
(DelegatingMethodAcc​essorImpl.java:43)
    at java.lang.reflect.Me​thod.invoke(Method.j​ava:606)
    at org.eclipse.equinox.​launcher.Main.invoke​Framework(Main.java:​669)
    at org.eclipse.equinox.​launcher.Main.basicR​un(Main.java:608)
    at org.eclipse.equinox.​launcher.Main.run(Ma​in.java:1515)
    at org.eclipse.equinox.​launcher.Main.main(M​ain.java:1488)

6) Click finish, error dialog without any message is shown and in log is:

!ENTRY org.tigris.subversio​n.subclipse.ui 4 0 2016-01-04 14:24:33.349
!MESSAGE
!STACK 0
java.lang.NullPointerException
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ResolveTreeConf​lictWizard.performFi​
nish(ResolveTreeConf​lictWizard.java:199)​
    at org.eclipse.jface.wi​zard.WizardDialog.fi​nishPressed
(WizardDialog.java:799)
    at
org.tigris.subversio​n.subclipse.ui.wizar​ds.ClosableWizardDia​log.finishPressed
(ClosableWizardDialog.java:14)
    at
org.tigris.subversio​n.subclipse.ui.wizar​ds.SizePersistedWiza​rdDialog.finishPress​
ed(SizePersistedWiza​rdDialog.java:26)
    at org.eclipse.jface.wi​zard.WizardDialog.bu​ttonPressed
(WizardDialog.java:429)
    at org.eclipse.jface.di​alogs.Dialog$2.widg​etSelected(Dialog.ja​va:619)
    at org.eclipse.swt.widg​ets.TypedListener.ha​ndleEvent
(TypedListener.java:248)
    at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
    at org.eclipse.swt.widg​ets.Display.sendEven​t(Display.java:4481)​
    at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1329)
    at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:3819)
    at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3430)
    at org.eclipse.jface.wi​ndow.Window.runEvent​Loop(Window.java:827​)
    at org.eclipse.jface.wi​ndow.Window.open(Win​dow.java:803)
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ResolveTreeConf​lictAction.run
(ResolveTreeConflict​Action.java:29)
    at org.eclipse.jface.ac​tion.Action.runWithE​vent(Action.java:473​)
    at org.eclipse.jface.ac​tion.ActionContribut​ionItem.handleWidget​Selection
(ActionContributionI​tem.java:595)
    at org.eclipse.jface.ac​tion.ActionContribut​ionItem.access
$2(ActionContributi​onItem.java:511)
    at org.eclipse.jface.ac​tion.ActionContribut​ionItem$5.handleEve​nt
(ActionContributionI​tem.java:420)
    at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
    at org.eclipse.swt.widg​ets.Display.sendEven​t(Display.java:4481)​
    at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1329)
    at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:3819)
    at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3430)
    at org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​$4.run
(PartRenderingEngine.java:1127)
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​
(Realm.java:337)
    at org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​.run
(PartRenderingEngine.java:1018)
    at org.eclipse.e4.ui.in​ternal.workbench.E4W​orkbench.createAndRu​nUI
(E4Workbench.java:156)
    at org.eclipse.ui.inter​nal.Workbench$5.run​(Workbench.java:654)​
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​
(Realm.java:337)
    at org.eclipse.ui.inter​nal.Workbench.create​AndRunWorkbench
(Workbench.java:598)
    at org.eclipse.ui.Platf​ormUI.createAndRunWo​rkbench(PlatformUI.j​ava:150)
    at org.eclipse.ui.inter​nal.ide.application.​IDEApplication.start​
(IDEApplication.java:139)
    at org.eclipse.equinox.​internal.app.Eclipse​AppHandle.run
(EclipseAppHandle.java:196)
    at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.runApplication
(EclipseAppLauncher.java:134)
    at org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.start
(EclipseAppLauncher.java:104)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run
(EclipseStarter.java:380)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run
(EclipseStarter.java:235)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke0(Native Method)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke
(NativeMethodAccesso​rImpl.java:57)
    at sun.reflect.Delegati​ngMethodAccessorImpl​.invoke
(DelegatingMethodAcc​essorImpl.java:43)
    at java.lang.reflect.Me​thod.invoke(Method.j​ava:606)
    at org.eclipse.equinox.​launcher.Main.invoke​Framework(Main.java:​669)
    at org.eclipse.equinox.​launcher.Main.basicR​un(Main.java:608)
    at org.eclipse.equinox.​launcher.Main.run(Ma​in.java:1515)
    at org.eclipse.equinox.​launcher.Main.main(M​ain.java:1488)

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

[Issue 1641] New - Impossible to resolve tree conflicts when Eclipse contains invalid project with the same SVN path jiriklement Jiri Klement 2016-01-04 08:33:39 PST
Messages per page: