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.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.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.subversion.merge.SVNConflictResolver.getConflictResolution(SVNConflictResolver.java:116)
> >
> com.collabnet.subversion.merge.SVNConflictResolver.resolve(SVNConflictResolver.java:83)
> >
> org.tigris.subversion.svnclientadapter.javahl.JhlConflictResolver.resolve(JhlConflictResolver.java:23)
> > org.tigris.subversion.javahl.SVNClient.merge(Native Method)
> >
> org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.merge(AbstractJhlClientAdapter.java:2316)
> > com.collabnet.subversion.merge.MergeCommand.run(MergeCommand.java:99)
> >
> com.collabnet.subversion.merge.MergeOperation.execute(MergeOperation.java:101)
> >
> org.tigris.subversion.subclipse.ui.operations.SVNOperation.run(SVNOperation.java:89)
> >
> org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144)
> >
> org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72)
> >
> org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
> > org.eclipse.core.internal.jobs.Worker.run(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.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=982177
>
> To unsubscribe from this discussion, e-mail: [
> dev-unsubscribe_at_subclipse.tigris.org].
>
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=982185
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
Received on 2008-12-10 13:53:13 CET