Bug 228015 - Unable to resolve conflicts
Summary: Unable to resolve conflicts
Status: RESOLVED FIXED
Alias: None
Product: Subversive
Classification: Technology
Component: Core (show other bugs)
Version: 0.7   Edit
Hardware: PC Linux-GTK
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Alexander Gurov CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-04-21 10:28 EDT by Jesse Eichar CLA
Modified: 2008-04-21 12:15 EDT (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jesse Eichar CLA 2008-04-21 10:28:21 EDT
I update the project and when I tried Team >Edit Conflicts an error dialog resulted.

Version:	0.7.0.v20080404

SVN Client:	org.eclipse.team.svn.connector.svnkit 2.0.0.v20080404 SVNKit 1.1.6 (http://svnkit.com/) r3855

JVM Properties:
{java.vendor=Sun Microsystems Inc., sun.java.launcher=SUN_STANDARD, org.osgi.supports.framework.extension=true, sun.management.compiler=HotSpot 64-Bit Server Compiler, osgi.framework.beginningstartlevel=1, os.name=Linux, osgi.ws=gtk, sun.desktop=gnome, java.vm.specification.vendor=Sun Microsystems Inc., java.runtime.version=1.6.0_03-b05, org.apache.commons.logging.simplelog.log.httpclient.wire.header=off, osgi.instance.area=file:/home/jeichar/dev/project/tl_caltar2/ws/, user.name=jeichar, org.osgi.framework.language=en, user.language=en, org.osgi.framework.processor=amd64, osgi.syspath=/home/jeichar/Applications/eclipse/plugins, sun.boot.library.path=/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/amd64, osgi.manifest.cache=/home/jeichar/Applications/eclipse/configuration/org.eclipse.osgi/manifests, osgi.compatibility.bootdelegation=true, eof=eof, java.version=1.6.0_03, org.osgi.framework.os.name=Linux, user.timezone=Europe/Zurich, sun.arch.data.model=64, java.endorsed.dirs=/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/endorsed, sun.cpu.isalist=, sun.jnu.encoding=UTF-8, file.encoding.pkg=sun.io, org.osgi.framework.vendor=Eclipse, file.separator=/, java.specification.name=Java Platform API Specification, java.class.version=50.0, user.country=US, org.eclipse.equinox.launcher.splash.location=/home/jeichar/Applications/eclipse/plugins/org.eclipse.platform_3.3.3.r33x_r20080129/splash.bmp, java.home=/usr/lib/jvm/java-6-sun-1.6.0.03/jre, osgi.os=linux, eclipse.commands=-os linux -ws gtk -arch x86_64 -showsplash -launcher /home/jeichar/Applications/eclipse/eclipse -name Eclipse --launcher.library /home/jeichar/Applications/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.3.R33x_v20080118/eclipse_1023.so -startup /home/jeichar/Applications/eclipse/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20080118.jar -exitdata d10014 -vm /usr/bin/java , java.vm.info=mixed mode, osgi.splashLocation=/home/jeichar/Applications/eclipse/plugins/org.eclipse.platform_3.3.3.r33x_r20080129/splash.bmp, os.version=2.6.22-14-generic, osgi.arch=x86_64, path.separator=:, java.vm.version=1.6.0_03-b05, org.osgi.supports.framework.fragment=true, osgi.framework.shape=jar, osgi.instance.area.default=file:/home/jeichar/workspace/, java.awt.printerjob=sun.print.PSPrinterJob, sun.io.unicode.encoding=UnicodeLittle, org.osgi.framework.version=1.4.0, osgi.install.area=file:/home/jeichar/Applications/eclipse/, osgi.framework=file:/home/jeichar/Applications/eclipse/plugins/org.eclipse.osgi_3.3.2.R33x_v20080105.jar, user.home=/home/jeichar, osgi.bundlestore=/home/jeichar/Applications/eclipse/configuration/org.eclipse.osgi/bundles, osgi.splashPath=platform:/base/plugins/org.eclipse.platform, osgi.nl=en_US, java.specification.vendor=Sun Microsystems Inc., java.library.path=/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.03/jre/../lib/amd64:/usr/lib64/firefox/:/usr/java/packages/lib/amd64:/lib:/usr/lib, java.vendor.url=http://java.sun.com/, org.eclipse.swt.browser.XULRunnerPath=/usr/lib64/firefox/, org.osgi.framework.os.version=2.6.22-14-generic, eclipse.startTime=1208784004031, java.vm.vendor=Sun Microsystems Inc., java.runtime.name=Java(TM) SE Runtime Environment, java.class.path=/home/jeichar/Applications/eclipse/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20080118.jar, osgi.requiredJavaVersion=1.5, org.apache.commons.logging.simplelog.log.org.apache.commons.httpclient=off, eclipse.vm=/usr/bin/java, java.vm.specification.name=Java Virtual Machine Specification, java.vm.specification.version=1.0, sun.cpu.endian=little, sun.os.patch.level=unknown, org.apache.commons.logging.simplelog.defaultlog=off, java.io.tmpdir=/tmp, java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi, eclipse.product=org.eclipse.sdk.ide, os.arch=amd64, java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment, java.ext.dirs=/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/ext:/usr/java/packages/lib/ext, user.dir=/home/jeichar, org.osgi.supports.framework.requirebundle=true, line.separator= , java.vm.name=Java HotSpot(TM) 64-Bit Server VM, org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog, eclipse.ee.install.verify=false, org.eclipse.swt.browser.XULRunnerInitialized=true, file.encoding=UTF-8, osgi.framework.version=3.3.2.R33x_v20080105, eclipse.buildId=M20080221-1800, eclipse.vmargs=-Dosgi.requiredJavaVersion=1.5 -Xms128m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m -jar /home/jeichar/Applications/eclipse/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20080118.jar , java.specification.version=1.6, org.osgi.framework.executionenvironment=OSGi/Minimum-1.0,OSGi/Minimum-1.1,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.6, osgi.logfile=/home/jeichar/dev/project/tl_caltar2/ws/.metadata/.log, osgi.configuration.area=file:/home/jeichar/Applications/eclipse/configuration/}

java.lang.IllegalArgumentException: Attempted to beginRule: F/caltar2/src/main/java/com/camptocamp/tl, does not match outer scope rule: MultiRule[F/caltar2/src/main/java/com/camptocamp/tl/caltar]
java.lang.IllegalArgumentException: Attempted to beginRule: F/caltar2/src/main/java/com/camptocamp/tl, does not match outer scope rule: MultiRule[F/caltar2/src/main/java/com/camptocamp/tl/caltar]
	at org.eclipse.core.runtime.Assert.isLegal(Assert.java:62)
	at org.eclipse.core.internal.jobs.ThreadJob.illegalPush(ThreadJob.java:122)
	at org.eclipse.core.internal.jobs.ThreadJob.push(ThreadJob.java:232)
	at org.eclipse.core.internal.jobs.ImplicitJobs.begin(ImplicitJobs.java:58)
	at org.eclipse.core.internal.jobs.JobManager.beginRule(JobManager.java:225)
	at org.eclipse.core.internal.resources.WorkManager.checkIn(WorkManager.java:117)
	at org.eclipse.core.internal.resources.Workspace.prepareOperation(Workspace.java:1744)
	at org.eclipse.core.internal.resources.Resource.refreshLocal(Resource.java:1416)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.showEditorFor(ShowConflictEditorOperation.java:104)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation$1.run(ShowConflictEditorOperation.java:88)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:117)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:145)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:140)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.runImpl(ShowConflictEditorOperation.java:86)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:76)
	at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:37)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:103)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:89)
	at org.eclipse.team.svn.ui.utility.WorkspaceModifyCancellableOperationWrapper.execute(WorkspaceModifyCancellableOperationWrapper.java:58)
	at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:101)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1797)
	at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:113)
	at org.eclipse.team.svn.ui.utility.SVNTeamOperationWrapper.run(SVNTeamOperationWrapper.java:35)
	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:55)
Comment 1 Alexander Gurov CLA 2008-04-21 12:15:53 EDT
Fix will be available at the end of this week.