Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Problem when merging
Problem when merging [message #885709] Wed, 13 June 2012 13:15 Go to next message
Mikael Petterson is currently offline Mikael Petterson
Messages: 152
Registered: July 2009
Senior Member
Hi,

I tried to merge but got the following error on newly added resources ( both files and dirs):

java.lang.IllegalArgumentException: Attempted to beginRule: F/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui, does not match outer scope rule: F/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/operation
at org.eclipse.core.runtime.Assert.isLegal(Assert.java:63)
at org.eclipse.core.internal.jobs.ThreadJob.illegalPush(ThreadJob.java:136)
at org.eclipse.core.internal.jobs.ThreadJob.push(ThreadJob.java:335)
at org.eclipse.core.internal.jobs.ImplicitJobs.begin(ImplicitJobs.java:63)
at org.eclipse.core.internal.jobs.JobManager.beginRule(JobManager.java:286)
at org.eclipse.core.internal.resources.WorkManager.checkIn(WorkManager.java:118)
at org.eclipse.core.internal.resources.Workspace.prepareOperation(Workspace.java:2282)
at org.eclipse.core.internal.resources.Folder.create(Folder.java:92)
at org.eclipse.core.internal.resources.Folder.create(Folder.java:125)
at org.eclipse.team.core.mapping.provider.MergeContext.ensureParentsExist(MergeContext.java:398)
at org.eclipse.team.core.mapping.provider.MergeContext$5.run(MergeContext.java:353)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
at org.eclipse.team.core.mapping.provider.MergeContext.run(MergeContext.java:408)
at org.eclipse.team.core.mapping.provider.MergeContext.performReplace(MergeContext.java:345)
at org.eclipse.team.core.mapping.provider.MergeContext.performReplace(MergeContext.java:322)
at org.eclipse.team.core.mapping.provider.MergeContext.merge(MergeContext.java:144)
at org.eclipse.team.core.mapping.provider.MergeContext$3.run(MergeContext.java:87)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
at org.eclipse.team.core.mapping.provider.MergeContext.run(MergeContext.java:408)
at org.eclipse.team.core.mapping.provider.MergeContext.merge(MergeContext.java:81)
at org.eclipse.team.internal.ui.mapping.ResourceMergeHandler$1.execute(ResourceMergeHandler.java:58)
at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:121)
at org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144)
at org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72)
at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)


This is version info that I have:

eclipse.buildId=M20110909-1335
java.version=1.6.0_13
java.vendor=Sun Microsystems Inc.
BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US
Framework arguments: -product org.eclipse.epp.package.rcp.product
Command-line arguments: -os linux -ws gtk -arch x86 -product org.eclipse.epp.package.rcp.product -clean -data /home/eraonel/eclipseccase_workspace_3432763

This is a continuation of log file /home/eraonel/eclipseccase_workspace_3432763/.metadata/.bak_0.log
Created Time: 2012-06-08 07:56:22.281


Any ideas how I can resolve the new files to that they get merged too?

br,

//mike
Re: Problem when merging [message #892371 is a reply to message #885709] Wed, 27 June 2012 22:45 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 588
Registered: July 2009
Senior Member
This doesn't look like an egit problem as no egit class is mentioned in the stack trace
Re: Problem when merging [message #993205 is a reply to message #892371] Sun, 23 December 2012 19:02 Go to previous message
Robin Stocker is currently offline Robin Stocker
Messages: 6
Registered: July 2009
Junior Member
It was indeed a problem in Platform Team, see bug 362219. It should be fixed in Eclipse 4.3.
Previous Topic:Delete Added Line fails to delete LF at end of file
Next Topic:2.3.0 missing project-set support?
Goto Forum:
  


Current Time: Wed Oct 22 15:29:07 GMT 2014

Powered by FUDForum. Page generated in 0.04077 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software