Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 335555

Summary:	ID-D7R3E
Product:	[Technology] Subversive	Reporter:	Alain Mahier <amahier>
Component:	Core	Assignee:	Igor Burilo <igor.burilo>
Status:	RESOLVED NOT_ECLIPSE	QA Contact:
Severity:	normal
Priority:	P3	CC:	a.gurov
Version:	0.7
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Alain Mahier

2011-01-27 06:02:00 EST

Version:	0.7.9.I20110124-1700

SVN Client:	org.eclipse.team.svn.connector.svnkit15 2.2.2.I20110124-1700 SVN/1.5.6 SVNKit/1.2.3 (http://svnkit.com/) r5745

JVM Properties:
{java.runtime.name=Java(TM) SE Runtime Environment, java.runtime.version=1.6.0_23-b05, java.vendor=Sun Microsystems Inc., line.separator=
 , java.class.version=50.0, os.name=Windows 7, os.arch=amd64, user.country=FR, os.version=6.1, eclipse.commands=-os win32 -ws win32 -arch x86_64 -showsplash -launcher K:\opt\springsource-2.5.1\sts-2.5.1.RELEASE\STS.exe -name STS --launcher.library K:\opt\springsource-2.5.1\sts-2.5.1.RELEASE\plugins/org.eclipse.equinox.launcher.win32.win32.x86_64_1.1.1.R36x_v20100810\eclipse_1309.dll -startup K:\opt\springsource-2.5.1\sts-2.5.1.RELEASE\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -exitdata 1088_58 -product com.springsource.sts.ide -vm K:/jdk1.6.0_23/bin/javaw.exe , java.version=1.6.0_23, osgi.framework.version=3.6.1.R36x_v20100806, file.separator=\, java.vm.info=mixed mode, path.separator=;, user.timezone=Europe/Paris, user.language=fr, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=Cp1252}
 
 
 Context of the exception :
mergeing from a branch into trunk. Problem occured on a directrory independently added on the two branches at the same place.

Mergeing of siblings directrory is possible as children directories of this directory too. Only mergeing of parent directories fail (it implies i cannot merge my entire project through the merge view of eclipse)

No problem with the command line, but it's not the same version and I do not use the two distinct tools on the same directories.

I have also updated the subversive plugin today (from	0.7.9.I20101203-1700) before having this problem.


Two errors occured (the first without stacktrace) :

-- BEGIN --

eclipse.buildId=2.5.2.201101081000-RELEASE
java.version=1.6.0_23
java.vendor=Sun Microsystems Inc.
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=fr_FR
Framework arguments:  -product com.springsource.sts.ide
Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product com.springsource.sts.ide


Error
Wed Jan 26 19:57:13 CET 2011
SVN: '0x00000107: Synchronizing' operation finished with error

-- END --

The second is detailed below
 
 -- BEGIN --

Error
Wed Jan 26 19:57:13 CET 2011
Merge status operation failed.

org.eclipse.team.svn.core.connector.SVNConnectorException: svn: chunked stream ended unexpectedly
svn: REPORT request failed on '/!svn/vcc/default'
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.handleClientException(SVNKitConnector.java:1390)
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:816)
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:567)
	at org.eclipse.team.svn.core.extension.factory.ThreadNameModifier.mergeStatus(ThreadNameModifier.java:358)
	at org.eclipse.team.svn.core.operation.local.MergeStatusOperation.doMerge1URL(MergeStatusOperation.java:99)
	at org.eclipse.team.svn.core.operation.local.MergeStatusOperation$2.run(MergeStatusOperation.java:69)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:118)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:154)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:149)
	at org.eclipse.team.svn.core.operation.local.MergeStatusOperation.runImpl(MergeStatusOperation.java:66)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
	at org.eclipse.team.svn.core.operation.CompositeOperation.runImpl(CompositeOperation.java:95)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81)
	at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:39)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:90)
	at org.eclipse.team.svn.core.synchronize.AbstractSVNSubscriber.findChanges(AbstractSVNSubscriber.java:314)
	at org.eclipse.team.svn.core.synchronize.AbstractSVNSubscriber$UpdateStatusOperation$2.run(AbstractSVNSubscriber.java:349)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:118)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:154)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:149)
	at org.eclipse.team.svn.core.synchronize.AbstractSVNSubscriber$UpdateStatusOperation.runImpl(AbstractSVNSubscriber.java:347)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81)
	at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:39)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:90)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:81)
	at org.eclipse.team.svn.core.synchronize.AbstractSVNSubscriber.refresh(AbstractSVNSubscriber.java:186)
	at org.eclipse.team.svn.core.synchronize.MergeSubscriber.refresh(MergeSubscriber.java:129)
	at org.eclipse.team.internal.ui.synchronize.RefreshSubscriberParticipantJob.doRefresh(RefreshSubscriberParticipantJob.java:116)
	at org.eclipse.team.internal.ui.synchronize.RefreshParticipantJob.run(RefreshParticipantJob.java:309)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: org.tigris.subversion.javahl.ClientException: svn: chunked stream ended unexpectedly
svn: REPORT request failed on '/!svn/vcc/default'
	at org.tigris.subversion.javahl.JavaHLObjectFactory.throwException(JavaHLObjectFactory.java:724)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.throwException(SVNClientImpl.java:1929)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:1049)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:1019)
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:671)
	... 31 more
Caused by: org.tmatesoft.svn.core.SVNException: svn: chunked stream ended unexpectedly
svn: REPORT request failed on '/!svn/vcc/default'
	at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:103)
	at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:87)
	at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:635)
	at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:274)
	at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:262)
	at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.doReport(DAVConnection.java:258)
	at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.runReport(DAVRepository.java:1211)
	at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.diff(DAVRepository.java:1057)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.driveMergeReportEditor(SVNMergeDriver.java:2426)
	at org.tmatesoft.svn.core.internal.wc.SVNExtendedMergeDriver.driveMergeReportEditor(SVNExtendedMergeDriver.java:310)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.doDirectoryMerge(SVNMergeDriver.java:1110)
	at org.tmatesoft.svn.core.internal.wc.SVNExtendedMergeDriver.doDirectoryMerge(SVNExtendedMergeDriver.java:288)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.doMerge(SVNMergeDriver.java:833)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.runPeggedMerge(SVNMergeDriver.java:562)
	at org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge(SVNDiffClient.java:2061)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:1034)
	... 33 more

-- END --

Comment 1 Alexander Gurov

2011-01-30 10:33:18 EST

There is an protocol level issue which is related to the SVN Kit internals.
The version of SVN Kit library which you are currently using is the stale one. So, the issue is most likely fixed at the moment in the latest SVN Kit version. In order to check it you can install SVN Kit 1.3.5-based connector. The only important thing is that SVN Kit 1.3.5 could silently convert your working copy into the SVN 1.6 format and external SVN tools which is not compatible with the SVN of 1.6 version will be rendered unable to handle the converted working copy.