Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1121] New - Lock-up during merge

subclipse
Discussion topic

Back to topic list

[Issue 1121] New - Lock-up during merge

Author jbblackburn
Full name James Blackburn
Date 2010-03-15 03:54:45 PDT
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1121
                 Issue #|1121
                 Summary|Lock-up during merge
               Component|subclipse
                 Version|current
                Platform|All
              OS/Version|All
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|core
             Assigned to|issues@subclipse
             Reported by|jbblackburn






------- Additional comments from jbblackburn at tigris dot org Mon Mar 15 03:54:45 -0700 2010 -------
A user's sublcipse (1.6.8) locked up during performing a reintegrate merge
today. Java was using 100% of CPU, the only Thread doing anything interesting
was the merge thread.

This may have been fixed in 1.6.9 or 1.6.10 but none of the changelog entries
looked relevant.

"Worker-12" prio=10 tid=0x0000002ae475e800 nid=0x22ff runnable
[0x0000000041940000.​.0x0000000041941cb0]​
   java.lang.Thread.State: RUNNABLE
        at
com.collabnet.subver​sion.merge.SVNConfli​ctResolver.getConfli​ctResolution(SVNConf​lictResolver.java:13​8)
        at
com.collabnet.subver​sion.merge.SVNConfli​ctResolver.resolve(S​VNConflictResolver.j​ava:105)
        at
org.tigris.subversio​n.svnclientadapter.j​avahl.JhlConflictRes​olver.resolve(JhlCon​flictResolver.java:2​3)
        at
org.tmatesoft.svn.co​re.javahl.SVNClientI​mpl$12.handleConfli​ct(SVNClientImpl.jav​a:1763)
        at
org.tmatesoft.svn.co​re.internal.wc.Defau​ltSVNMerger.getMerge​Action(DefaultSVNMer​ger.java:282)
        at
org.tmatesoft.svn.co​re.internal.wc.Defau​ltSVNMerger.processM​ergedFiles(DefaultSV​NMerger.java:252)
        at
org.tmatesoft.svn.co​re.internal.wc.Abstr​actSVNMerger.mergeTe​xt(AbstractSVNMerger​.java:80)
        at
org.tmatesoft.svn.co​re.internal.wc.admin​.SVNAdminArea.mergeT​ext(SVNAdminArea.jav​a:478)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNMe​rgeCallback.fileChan​ged(SVNMergeCallback​.java:358)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNRe​moteDiffEditor.close​File(SVNRemoteDiffEd​itor.java:376)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNRe​moteDiffEditor.close​File(SVNRemoteDiffEd​itor.java:343)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNCa​ncellableEditor.clos​eFile(SVNCancellable​Editor.java:141)
        at
org.tmatesoft.svn.co​re.internal.io.svn.S​VNEditModeReader.pro​cessCommand(SVNEditM​odeReader.java:162)
        at
org.tmatesoft.svn.co​re.internal.io.svn.S​VNEditModeReader.dri​veEditor(SVNEditMode​Reader.java:231)
        at
org.tmatesoft.svn.co​re.internal.io.svn.S​VNRepositoryImpl.dif​f(SVNRepositoryImpl.​java:1404)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNMe​rgeDriver.driveMerge​ReportEditor(SVNMerg​eDriver.java:2474)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNMe​rgeDriver.doDirector​yMerge(SVNMergeDrive​r.java:1076)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNMe​rgeDriver.doMerge(SV​NMergeDriver.java:84​4)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNMe​rgeDriver.mergeCousi​nsAndSupplementMerge​Info(SVNMergeDriver.​java:1807)
        at
org.tmatesoft.svn.co​re.internal.wc.SVNMe​rgeDriver.runMergeRe​integrate(SVNMergeDr​iver.java:757)
        at
org.tmatesoft.svn.co​re.wc.SVNDiffClient.​doMergeReIntegrate(S​VNDiffClient.java:22​57)
        at
org.tmatesoft.svn.co​re.javahl.SVNClientI​mpl.mergeReintegrate​(SVNClientImpl.java:​1032)
        at
org.tigris.subversio​n.svnclientadapter.j​avahl.AbstractJhlCli​entAdapter.mergeRein​tegrate(AbstractJhlC​lientAdapter.java:21​21)
        at com.collabnet.subver​sion.merge.MergeComm​and.run(MergeCommand​.java:103)
        at
com.collabnet.subver​sion.merge.MergeOper​ation.execute(MergeO​peration.java:118)
        at
org.tigris.subversio​n.subclipse.ui.opera​tions.SVNOperation.r​un(SVNOperation.java​:90)
        at
org.eclipse.team.int​ernal.ui.actions.Job​RunnableContext.run(​JobRunnableContext.j​ava:144)
        at
org.eclipse.team.int​ernal.ui.actions.Job​RunnableContext$Res​ourceJob.runInWorksp​ace(JobRunnableConte​xt.java:72)
        at
org.eclipse.core.int​ernal.resources.Inte​rnalWorkspaceJob.run​(InternalWorkspaceJo​b.java:38)
        at org.eclipse.core.int​ernal.jobs.Worker.ru​n(Worker.java:55)

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

Messages

Show all messages in topic

[Issue 1121] New - Lock-up during merge jbblackburn James Blackburn 2010-03-15 03:54:45 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 04:58:52 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 08:49:49 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 08:51:21 PDT
     [Issue 1121] Lock-up during merge selsemore Stephen Elsemore 2010-03-15 09:17:17 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 09:24:41 PDT
     [Issue 1121] Lock-up during merge markphip Mark Phippard 2010-03-15 05:58:55 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 06:10:20 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 06:34:36 PDT
     [Issue 1121] Lock-up during merge selsemore Stephen Elsemore 2010-03-15 07:00:46 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 07:35:21 PDT
     [Issue 1121] Lock-up during merge selsemore Stephen Elsemore 2010-03-15 08:05:45 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 08:16:41 PDT
     [Issue 1121] Lock-up during merge jbblackburn James Blackburn 2010-03-15 08:45:28 PDT
Messages per page: