Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1057] New - exception while conflict in multi-revisions

subclipse
Discussion topic

Back to topic list

[Issue 1057] New - exception while conflict in multi-revisions

Author maho
Full name Łukasz Mach
Date 2009-12-29 03:12:32 PST
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1057
                 Issue #|1057
                 Summary|exception while conflict in multi-revisions
               Component|subclipse
                 Version|1.4.x
                Platform|All
              OS/Version|Linux
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|core
             Assigned to|issues@subclipse
             Reported by|maho






------- Additional comments from maho at tigris dot org Tue Dec 29 03:12:30 -0800 2009 -------
I'm merging branch to another. I choosed manually selecting revisions. I
selected few of them and I see in console such command:

merge -c 14488 -c 14490 -c 14521 -r 14529:14534 svn://remote.repo /my/path

In one of the first sets I got conflict. Tool asked me what to do, and I choosed
"resolve using theirs". And eclipse stopped doing anything. In logs, I have
found such traceback:

#v+
!ENTRY org.eclipse.jface 4 0 2009-12-29 12:00:46.635
!MESSAGE Unhandled event loop exception during blocked modal context.
!STACK 0
org.eclipse.swt.SWTException: Failed to execute runnable
(java.lang.NullPoint​erException)
        at org.eclipse.swt.SWT.​error(SWT.java:3884)​
        at org.eclipse.swt.SWT.​error(SWT.java:3799)​
        at
org.eclipse.swt.widg​ets.Synchronizer.run​AsyncMessages(Synchr​onizer.java:137)
        at org.eclipse.swt.widg​ets.Display.runAsync​Messages(Display.jav​a:3468)
        at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3115)
        at
org.eclipse.jface.op​eration.ModalContext​$ModalContextThread​.block(ModalContext.​java:173)
        at org.eclipse.jface.op​eration.ModalContext​.run(ModalContext.ja​va:388)
        at org.eclipse.jface.wi​zard.WizardDialog.ru​n(WizardDialog.java:​944)
        at
com.collabnet.subver​sion.merge.wizards.M​ergeWizardRevisionsP​age.getLogEntries(Me​rgeWizardRevisionsPa​ge.java:446)
        at
com.collabnet.subver​sion.merge.wizards.M​ergeWizardRevisionsP​age.refresh(MergeWiz​ardRevisionsPage.jav​a:383)
        at
com.collabnet.subver​sion.merge.wizards.M​ergeWizardRevisionsP​age.setVisible(Merge​WizardRevisionsPage.​java:343)
        at
org.eclipse.jface.wi​zard.WizardDialog.up​dateForPage(WizardDi​alog.java:1171)
        at org.eclipse.jface.wi​zard.WizardDialog.ac​cess$2(WizardDialog​.java:1149)
        at org.eclipse.jface.wi​zard.WizardDialog$5​.run(WizardDialog.ja​va:1138)
        at org.eclipse.swt.cust​om.BusyIndicator.sho​wWhile(BusyIndicator​.java:70)
        at org.eclipse.jface.wi​zard.WizardDialog.sh​owPage(WizardDialog.​java:1136)
        at org.eclipse.jface.wi​zard.WizardDialog.ne​xtPressed(WizardDial​og.java:830)
        at
org.eclipse.jface.wi​zard.WizardDialog.bu​ttonPressed(WizardDi​alog.java:369)
        at org.eclipse.jface.di​alogs.Dialog$2.widg​etSelected(Dialog.ja​va:624)
        at org.eclipse.swt.widg​ets.TypedListener.ha​ndleEvent(TypedListe​ner.java:228)
        at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
        at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1176)
        at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:3493)
        at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3112)
        at org.eclipse.jface.wi​ndow.Window.runEvent​Loop(Window.java:825​)
        at org.eclipse.jface.wi​ndow.Window.open(Win​dow.java:801)
        at
com.collabnet.subver​sion.merge.actions.M​ergeAction.execute(M​ergeAction.java:37)
        at
org.tigris.subversio​n.subclipse.ui.actio​ns.ConfigurableMerge​Action.execute(Confi​gurableMergeAction.j​ava:27)
        at
org.tigris.subversio​n.subclipse.ui.actio​ns.SVNAction.run(SVN​Action.java:56)
        at
org.eclipse.ui.actio​ns.ActionDelegate.ru​nWithEvent(ActionDel​egate.java:70)
        at org.eclipse.ui.inter​nal.PluginAction.run​WithEvent(PluginActi​on.java:241)
        at
org.eclipse.jface.ac​tion.ActionContribut​ionItem.handleWidget​Selection(ActionCont​ributionItem.java:58​4)
        at
org.eclipse.jface.ac​tion.ActionContribut​ionItem.access$2(Ac​tionContributionItem​.java:501)
        at
org.eclipse.jface.ac​tion.ActionContribut​ionItem$5.handleEve​nt(ActionContributio​nItem.java:411)
        at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
        at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1176)
        at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:3493)
        at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3112)
        at org.eclipse.ui.inter​nal.Workbench.runEve​ntLoop(Workbench.jav​a:2405)
        at org.eclipse.ui.inter​nal.Workbench.runUI(​Workbench.java:2369)​
        at org.eclipse.ui.inter​nal.Workbench.access​$4(Workbench.java:2​221)
        at org.eclipse.ui.inter​nal.Workbench$5.run​(Workbench.java:500)​
        at
org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​(Realm.java:332)
        at
org.eclipse.ui.inter​nal.Workbench.create​AndRunWorkbench(Work​bench.java:493)
        at org.eclipse.ui.Platf​ormUI.createAndRunWo​rkbench(PlatformUI.j​ava:149)
        at
org.eclipse.ui.inter​nal.ide.application.​IDEApplication.start​(IDEApplication.java​:113)
        at
org.eclipse.equinox.​internal.app.Eclipse​AppHandle.run(Eclips​eAppHandle.java:194)​
        at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.runApplication(Ecli​pseAppLauncher.java:​110)
        at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.start(EclipseAppLau​ncher.java:79)
        at
org.eclipse.core.run​time.adaptor.Eclipse​Starter.run(EclipseS​tarter.java:368)
        at
org.eclipse.core.run​time.adaptor.Eclipse​Starter.run(EclipseS​tarter.java:179)
        at sun.reflect.NativeMe​thodAccessorImpl.inv​oke0(Native Method)
        at
sun.reflect.NativeMe​thodAccessorImpl.inv​oke(NativeMethodAcce​ssorImpl.java:39)
        at
sun.reflect.Delegati​ngMethodAccessorImpl​.invoke(DelegatingMe​thodAccessorImpl.jav​a:25)
        at java.lang.reflect.Me​thod.invoke(Method.j​ava:597)
        at org.eclipse.equinox.​launcher.Main.invoke​Framework(Main.java:​559)
        at org.eclipse.equinox.​launcher.Main.basicR​un(Main.java:514)
        at org.eclipse.equinox.​launcher.Main.run(Ma​in.java:1311)
        at org.eclipse.equinox.​launcher.Main.main(M​ain.java:1287)
Caused by: java.lang.NullPointerException
        at java.util.TreeMap.ge​tEntry(TreeMap.java:​324)
        at java.util.TreeMap.co​ntainsKey(TreeMap.ja​va:209)
        at java.util.TreeSet.co​ntains(TreeSet.java:​217)
        at
com.collabnet.subver​sion.merge.wizards.M​ergeWizardRevisionsP​age$9$1.run(MergeW​izardRevisionsPage.j​ava:422)
        at org.eclipse.swt.widg​ets.RunnableLock.run​(RunnableLock.java:3​5)
        at
org.eclipse.swt.widg​ets.Synchronizer.run​AsyncMessages(Synchr​onizer.java:134)
        ... 56 more
(END)
#v-
#v-

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

Messages

Show all messages in topic

[Issue 1057] New - exception while conflict in multi-revisions maho Łukasz Mach 2009-12-29 03:12:32 PST
     [Issue 1057] exception while conflict in multi-revisions selsemore Stephen Elsemore 2010-01-04 08:22:41 PST
     [Issue 1057] exception while conflict in multi-revisions maho Łukasz Mach 2010-01-05 05:49:06 PST
Messages per page: