Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: [Subclipse-dev] merge hangs after conflict resolution dialog

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: [Subclipse-dev] merge hangs after conflict resolution dialog

Author jcompagner
Full name jcompagner
Date 2008-12-10 04:53:02 PST
Message in that dialog i tried 2 options (also like use my current revision but also
display in grapical editor)

i can merge fine if i say upfront that i dont want to choose i will do it
all afterwards.

johan

P.S. i guess this is not really the right group to ask because it is the
merge client of collab, need to subscribe on more lists i guess.


On Wed, Dec 10, 2008 at 13:38, Mark Phippard <markphip at gmail dot com> wrote:

> Does it matter which option you choose? You did not say which option you
> chose.
>
> Mark
>
>
>
> On Wed, Dec 10, 2008 at 4:54 AM, jcompagner <jcompagner at gmail dot com> wrote:
> > Hi,
> >
> > i am using the latest version of subclipse (1.4.7)
> >
> > When i merge and everything can just be merged everything is ok
> >
> > But when a conflict arise and the dialog prompt comes u and i choose an
> > option and dismiss the dialog
> > nothing happens anymore (but cpu usage is high 1 thread is getting 1 core
> > for itself so 50% on a dual core)
> > and if i look at the thread dump i get this:
> >
> > Name: Worker-8
> > State: RUNNABLE
> > Total blocked: 565 Total waited: 815
> >
> > Stack trace:
> >
> com.collabnet.subver​sion.merge.SVNConfli​ctResolver.getConfli​ctResolution(SVNConf​lictResolver.java:11​6)
> >
> com.collabnet.subver​sion.merge.SVNConfli​ctResolver.resolve(S​VNConflictResolver.j​ava:83)
> >
> org.tigris.subversio​n.svnclientadapter.j​avahl.JhlConflictRes​olver.resolve(JhlCon​flictResolver.java:2​3)
> > org.tigris.subversio​n.javahl.SVNClient.m​erge(Native Method)
> >
> org.tigris.subversio​n.svnclientadapter.j​avahl.AbstractJhlCli​entAdapter.merge(Abs​tractJhlClientAdapte​r.java:2316)
> > com.collabnet.subver​sion.merge.MergeComm​and.run(MergeCommand​.java:99)
> >
> com.collabnet.subver​sion.merge.MergeOper​ation.execute(MergeO​peration.java:101)
> >
> org.tigris.subversio​n.subclipse.ui.opera​tions.SVNOperation.r​un(SVNOperation.java​:89)
> >
> org.eclipse.team.int​ernal.ui.actions.Job​RunnableContext.run(​JobRunnableContext.j​ava:144)
> >
> org.eclipse.team.int​ernal.ui.actions.Job​RunnableContext$Res​ourceJob.runInWorksp​ace(JobRunnableConte​xt.java:72)
> >
> org.eclipse.core.int​ernal.resources.Inte​rnalWorkspaceJob.run​(InternalWorkspaceJo​b.java:38)
> > org.eclipse.core.int​ernal.jobs.Worker.ru​n(Worker.java:55)
> >
> >
> > and it doesnt seem to end at all.
> >
> > all the other threads seem to work normally and eclipse isnt blocked.
> >
> > johan
> >
> >
>
>
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> --------------------​--------------------​--------------
>
> http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1043​&dsMessageId=982​177
>
> To unsubscribe from this discussion, e-mail: [
> dev-unsubscribe@subc​lipse.tigris.org].
>
Attachments
attachment-1274922

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

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Subclipse-dev] merge hangs after conflict resolution dialog jcompagner jcompagner 2008-12-10 01:54:40 PST
     Re: [Subclipse-dev] merge hangs after conflict resolution dialog "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-10 04:38:45 PST
         Re: [Subclipse-dev] merge hangs after conflict resolution dialog jcompagner jcompagner 2008-12-10 04:53:02 PST
             Re: [Subclipse-dev] merge hangs after conflict resolution dialog selsemore Stephen Elsemore 2008-12-10 06:50:02 PST
Messages per page: