Login | Register
My pages Projects Community openCollabNet

Discussions > users > [Subclipse-users] Branch merge issues

subclipse
Discussion topic

Back to topic list

[Subclipse-users] Branch merge issues

Author scolebourne
Full name Stephen Colebourne
Date 2009-05-22 09:51:08 PDT
Message Hi,
I've been trying to use Subclipse to merge files and folders without success for a few hours now. I thought I'd write and discuss my difficulties - Subclipse 1.6.2, Java HL 1.6.2 (rv37639), svn repository 1.5.

My basic goal is to merge changes from TRUNK to a branch. I am in the branch workspace, and do a team/merge.

My first issue is the complexity of the dialog box. Subclipse makes no effort to understand that the head of TRUNK and the head of the branch are the elements that are important. Instead, each time I go to the dialog I have to select the TRUNK URI at the top, then select the head revision, then unselect the From checkbox, then select the branch URI, and then select the head of the branch. This is a very slow UI, and doesn't map to the meaningful operations in a business scenario.

My second issue is that the merge is immediate. With CVS, performing a merge will provide a dialog that allows the user to pick and choose which files to merge back. I can find no equivalent to this in Subclipse.

My third issue is that the merge completes with lots of .prej files, one for every file that has two different revisions (one revision on TRUNK and one on the branch). This is because the repository was just converted from CVS, and the cvs-rev svn property is different between TRUNK and the Branch. I can find no way to ignore this property during the merge process, and it effectively makes merging useless.

My fourth issue is that I have NPE from the completed merge when I attempt to synchronize and then double click to compare the changes. This originally occurred on every attempt to view the file in the compare view, now it doesn't. I don't know what has changed.

ENTRY org.eclipse.jface 4 2 2009-05-22 16:41:32.075
!MESSAGE Problems occurred when invoking code from plug-in: "org.eclipse.jface".
!STACK 0
java.lang.NullPointerException
    at org.tigris.subversio​n.subclipse.core.res​ources.RemoteResourc​e.equals(RemoteResou​rce.java:154)
    at org.tigris.subversio​n.subclipse.core.res​ources.RemoteFile.eq​uals(RemoteFile.java​:155)
    at org.eclipse.team.cor​e.synchronize.SyncIn​fo.equalObjects(Sync​Info.java:327)
    at org.eclipse.team.cor​e.synchronize.SyncIn​fo.equalNodes(SyncIn​fo.java:319)
    at org.eclipse.team.cor​e.synchronize.SyncIn​fo.equals(SyncInfo.j​ava:277)
    at org.eclipse.team.ui.​synchronize.SyncInfo​CompareInput.equals(​SyncInfoCompareInput​.java:208)
    at org.eclipse.ui.inter​nal.EditorHistoryIte​m.matches(EditorHist​oryItem.java:114)
    at org.eclipse.ui.inter​nal.EditorHistory.re​move(EditorHistory.j​ava:118)
    at org.eclipse.ui.inter​nal.EditorHistory.ad​d(EditorHistory.java​:61)
    at org.eclipse.ui.inter​nal.EditorHistory.ad​d(EditorHistory.java​:51)
    at org.eclipse.ui.inter​nal.EditorManager.op​enEditorFromDescript​or(EditorManager.jav​a:682)
    at org.eclipse.ui.inter​nal.EditorManager.op​enEditor(EditorManag​er.java:639)
    at org.eclipse.ui.inter​nal.WorkbenchPage.bu​syOpenEditorBatched(​WorkbenchPage.java:2​817)
    at org.eclipse.ui.inter​nal.WorkbenchPage.bu​syOpenEditor(Workben​chPage.java:2729)
    at org.eclipse.ui.inter​nal.WorkbenchPage.ac​cess$11(WorkbenchPa​ge.java:2721)
    at org.eclipse.ui.inter​nal.WorkbenchPage$1​0.run(WorkbenchPage.​java:2673)
    at org.eclipse.swt.cust​om.BusyIndicator.sho​wWhile(BusyIndicator​.java:70)
    at org.eclipse.ui.inter​nal.WorkbenchPage.op​enEditor(WorkbenchPa​ge.java:2668)
    at org.eclipse.ui.inter​nal.WorkbenchPage.op​enEditor(WorkbenchPa​ge.java:2652)
    at org.eclipse.ui.inter​nal.WorkbenchPage.op​enEditor(WorkbenchPa​ge.java:2635)
    at org.eclipse.compare.​internal.CompareUIPl​ugin$1.run(CompareU​IPlugin.java:454)
    at org.eclipse.compare.​internal.CompareUIPl​ugin.syncExec(Compar​eUIPlugin.java:1171)​
    at org.eclipse.compare.​internal.CompareUIPl​ugin.internalOpenEdi​tor(CompareUIPlugin.​java:465)
    at org.eclipse.compare.​internal.CompareUIPl​ugin.openEditorInBac​kground(CompareUIPlu​gin.java:436)
    at org.eclipse.compare.​internal.CompareUIPl​ugin.openCompareEdit​or(CompareUIPlugin.j​ava:426)
    at org.eclipse.compare.​CompareUI.openCompar​eEditorOnPage(Compar​eUI.java:135)
    at org.eclipse.team.int​ernal.ui.synchronize​.actions.OpenInCompa​reAction.openCompare​Editor(OpenInCompare​Action.java:210)
    at org.eclipse.team.int​ernal.ui.synchronize​.actions.OpenInCompa​reAction.openCompare​Editor(OpenInCompare​Action.java:169)
    at org.eclipse.team.int​ernal.ui.synchronize​.actions.OpenInCompa​reAction.openCompare​EditorOnSyncInfo(Ope​nInCompareAction.jav​a:149)
    at org.eclipse.team.int​ernal.ui.synchronize​.actions.OpenInCompa​reAction.run(OpenInC​ompareAction.java:62​)
    at org.eclipse.team.int​ernal.ui.synchronize​.actions.OpenWithAct​ionGroup.openInCompa​reEditor(OpenWithAct​ionGroup.java:142)
    at org.eclipse.team.int​ernal.ui.synchronize​.actions.DefaultSync​hronizePageActions$​1.run(DefaultSynchro​nizePageActions.java​:47)
    at org.eclipse.team.int​ernal.ui.synchronize​.StructuredViewerAdv​isor.handleOpen(Stru​cturedViewerAdvisor.​java:171)
    at org.eclipse.team.int​ernal.ui.synchronize​.StructuredViewerAdv​isor.access$0(Struc​turedViewerAdvisor.j​ava:167)
    at org.eclipse.team.int​ernal.ui.synchronize​.StructuredViewerAdv​isor$3.open(Structu​redViewerAdvisor.jav​a:131)
    at org.eclipse.jface.vi​ewers.StructuredView​er$2.run(Structured​Viewer.java:820)
    at org.eclipse.core.run​time.SafeRunner.run(​SafeRunner.java:37)
    at org.eclipse.core.run​time.Platform.run(Pl​atform.java:880)
    at org.eclipse.ui.inter​nal.JFaceUtil$1.run​(JFaceUtil.java:48)
    at org.eclipse.jface.ut​il.SafeRunnable.run(​SafeRunnable.java:17​5)
    at org.eclipse.jface.vi​ewers.StructuredView​er.fireOpen(Structur​edViewer.java:818)
    at org.eclipse.jface.vi​ewers.StructuredView​er.handleOpen(Struct​uredViewer.java:1079​)
    at org.eclipse.jface.vi​ewers.StructuredView​er$6.handleOpen(Str​ucturedViewer.java:1​183)
    at org.eclipse.jface.ut​il.OpenStrategy.fire​OpenEvent(OpenStrate​gy.java:263)
    at org.eclipse.jface.ut​il.OpenStrategy.acce​ss$2(OpenStrategy.j​ava:257)
    at org.eclipse.jface.ut​il.OpenStrategy$1.h​andleEvent(OpenStrat​egy.java:297)
    at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
    at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1003)
    at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:3823)
    at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3422)
    at org.eclipse.ui.inter​nal.Workbench.runEve​ntLoop(Workbench.jav​a:2384)
    at org.eclipse.ui.inter​nal.Workbench.runUI(​Workbench.java:2348)​
    at org.eclipse.ui.inter​nal.Workbench.access​$4(Workbench.java:2​200)
    at org.eclipse.ui.inter​nal.Workbench$5.run​(Workbench.java:495)​
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​(Realm.java:288)
    at org.eclipse.ui.inter​nal.Workbench.create​AndRunWorkbench(Work​bench.java:490)
    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:193)​
    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:386)
    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(Unknown Source)
    at sun.reflect.Delegati​ngMethodAccessorImpl​.invoke(Unknown Source)
    at java.lang.reflect.Me​thod.invoke(Unknown Source)
    at org.eclipse.equinox.​launcher.Main.invoke​Framework(Main.java:​549)
    at org.eclipse.equinox.​launcher.Main.basicR​un(Main.java:504)
    at org.eclipse.equinox.​launcher.Main.run(Ma​in.java:1236)

!ENTRY org.eclipse.core.jobs 4 2 2009-05-22 16:41:32.416
!MESSAGE An internal error occurred during: "Initializing Compare Editor".
!STACK 0
java.lang.NullPointerException
    at org.tigris.subversio​n.subclipse.core.res​ources.RemoteResourc​e.getCachePath(Remot​eResource.java:228)
    at org.eclipse.team.cor​e.variants.CachedRes​ourceVariant.isHandl​eCached(CachedResour​ceVariant.java:189)
    at org.eclipse.team.cor​e.variants.CachedRes​ourceVariant.isConte​ntsCached(CachedReso​urceVariant.java:156​)
    at org.eclipse.team.cor​e.variants.CachedRes​ourceVariant.ensureC​ontentsCached(Cached​ResourceVariant.java​:110)
    at org.eclipse.team.cor​e.variants.CachedRes​ourceVariant.getStor​age(CachedResourceVa​riant.java:101)
    at org.eclipse.team.int​ernal.ui.synchronize​.RemoteResourceTyped​Element.fetchContent​s(RemoteResourceType​dElement.java:63)
    at org.eclipse.team.int​ernal.ui.StorageType​dElement.cacheConten​ts(StorageTypedEleme​nt.java:53)
    at org.eclipse.team.int​ernal.ui.synchronize​.SyncInfoModelElemen​t.cacheContents(Sync​InfoModelElement.jav​a:185)
    at org.eclipse.team.ui.​synchronize.Abstract​SynchronizeParticipa​nt.prepareCompareInp​ut(AbstractSynchroni​zeParticipant.java:3​26)
    at org.eclipse.team.ui.​synchronize.SyncInfo​CompareInput.prepare​CompareInput(SyncInf​oCompareInput.java:1​75)
    at org.eclipse.team.ui.​synchronize.Saveable​CompareEditorInput.p​repareInput(Saveable​CompareEditorInput.j​ava:239)
    at org.eclipse.compare.​CompareEditorInput.r​un(CompareEditorInpu​t.java:448)
    at org.eclipse.compare.​internal.CompareUIPl​ugin.prepareInput(Co​mpareUIPlugin.java:4​84)
    at org.eclipse.compare.​internal.CompareEdit​or$2.run(CompareEdi​tor.java:314)
    at org.eclipse.core.int​ernal.jobs.Worker.ru​n(Worker.java:55)

My fifth issue is with attempting to use the alternative Compare With option to bring files from TRUNK to the Branch. That seems to work fine so long as there are no new folders. However, my change includes new folders, and although this shows up in the compare view, it cannot be actioned, so there is no way to use that view to pull the changes across (as there is in CVS).

Furthermore, there is no simple, one-click, menu item to compare with the head of TRUNK as there is in CVS. The lack of such basic business led operations as this leads me to question how the authors are managing to use the tool.

Any suggestions to allow me to perform this simple task (merge selected files from TRUNK to branch) are welcome, although I'm not holding out much hope of ever being able to use subversion from Eclipse in a meaningful way right now.

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

Messages

Show all messages in topic

[Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-22 09:51:08 PDT
     Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-22 10:44:40 PDT
         RE: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-23 03:22:14 PDT
             Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-23 06:16:35 PDT
                 RE: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-26 06:26:32 PDT
                     Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 06:40:42 PDT
                         RE: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-26 08:40:19 PDT
                             Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 09:04:45 PDT
                                 RE: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-27 05:34:45 PDT
                                     Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-27 10:31:26 PDT
                                     RE: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-27 10:45:26 PDT
                                         Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-27 10:51:19 PDT
                                             RE: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-28 00:49:30 PDT
                                                 RE: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues scolebourne Stephen Colebourne 2009-05-28 00:50:59 PDT
                                                 Re: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-06-02 07:44:53 PDT
                                                     Re: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-06-02 10:58:38 PDT
                                                         Re: Re: Re: Re: Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-06-11 12:15:58 PDT
                 Re: Re: [Subclipse-users] Branch merge issues jcompagner jcompagner 2009-05-26 07:11:57 PDT
                     Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 07:25:53 PDT
                     Re: Re: [Subclipse-users] Branch merge issues markphip Mark Phippard 2009-05-26 07:26:03 PDT
Messages per page: