Bug 324936

Description Michael Meß 2010-09-10 05:36:29 EDT

What steps will reproduce the problem?
1. Open Team->Merge Dialog and select Source
2. For revisions use "Browse" button
3. Select more than one revision and click OK

Result: 
The revisions appear in the wrong order and thus merging fails.
Lower numbers must appear before higher numbers, so that merging works.

Workaround:
After selecting with "Browse", edit the revision numbers in the text field, so that they appear in the correct order.

-- Error Details --
Date: Fri Sep 10 11:13:04 CEST 2010
Message: SVN: '0x0000010a: Merge Status' operation finished with error
Severity: Error
Product: Eclipse 1.2.2.20100122-1337 (org.eclipse.epp.package.jee.product)
Plugin: org.eclipse.team.svn.core.svnnature
Session Data:
eclipse.buildId=unknown
java.version=1.6.0_17
java.vendor=Sun Microsystems Inc.
BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US
Framework arguments:  -product org.eclipse.epp.package.jee.product -keyring /home/michael/.eclipse-keyring/.keyring
Command-line arguments:  -os linux -ws gtk -arch x86 -product org.eclipse.epp.package.jee.product -keyring /home/michael/.eclipse-keyring/.keyring



-- Error Details --
Date: Fri Sep 10 11:13:04 CEST 2010
Message: Merge status operation failed.
Severity: Error
Product: Eclipse 1.2.2.20100122-1337 (org.eclipse.epp.package.jee.product)
Plugin: org.eclipse.team.svn.core.svnnature
Exception Stack Trace:
org.eclipse.team.svn.core.connector.SVNConnectorException: svn: Attempt to add tree conflict that already exists at '/export/home/michael/macd/all-macd/bin/startFixRegressionTestForGivenLogFile'
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.handleClientException(SVNKitConnector.java:1424)
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:838)
	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.refresh(AbstractSVNSubscriber.java:189)
	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:55)
Caused by: org.tigris.subversion.javahl.ClientException: svn: Attempt to add tree conflict that already exists at '/export/home/michael/macd/all-macd/bin/startFixRegressionTestForGivenLogFile'
	at org.tigris.subversion.javahl.JavaHLObjectFactory.throwException(JavaHLObjectFactory.java:778)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.throwException(SVNClientImpl.java:1924)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:1047)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:1017)
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:671)
	... 21 more
Caused by: org.tmatesoft.svn.core.SVNException: svn: Attempt to add tree conflict that already exists at '/export/home/michael/macd/all-macd/bin/startFixRegressionTestForGivenLogFile'
	at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
	at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
	at org.tmatesoft.svn.core.internal.io.svn.SVNEditModeReader.driveEditor(SVNEditModeReader.java:248)
	at org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryImpl.diff(SVNRepositoryImpl.java:1404)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.driveMergeReportEditor(SVNMergeDriver.java:2474)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.doDirectoryMerge(SVNMergeDriver.java:1123)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.doMerge(SVNMergeDriver.java:844)
	at org.tmatesoft.svn.core.internal.wc.SVNMergeDriver.runPeggedMerge(SVNMergeDriver.java:572)
	at org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge(SVNDiffClient.java:2062)
	at org.tmatesoft.svn.core.javahl.SVNClientImpl.merge(SVNClientImpl.java:1032)
	... 23 more