[svn] 2053: Merge revisions 1987,1988,2007 and 2039 from Trunk to 3.0. x branch

Question

Revision: 2053
Author: [email protected]
Date: 2008-06-12 08:49:07 -0700 (Thu, 12 Jun 2008)
Log Message:
Merge revisions 1987,1988,2007 and 2039 from Trunk to 3.0.x branch
checkintests: passed
Modified Paths:
blazeds/branches/3.0.x/qa/apps/qa-regress/testsuites/flexunit/build.xml
blazeds/branches/3.0.x/qa/apps/qa-regress/testsuites/mxunit/build.xml
blazeds/branches/3.0.x/qa/apps/qa-regress/testsuites/mxunit/stylesheets/junit-frames.xsl
blazeds/branches/3.0.x/qa/features/excludes.properties

Answer 1

Al Roogle wrote:
> Why would the "Reintegrate" tab not appear in the Subversive Team Merge
> dialog (only the "URL" and "2 URLs" tabs are there), when all components
> are up to date ?
> OS is WinXP SP3 [presumably irrelevant].
> JVM is Sun 1.5.0-b64 [1.5.x supported according to
> http://wiki.eclipse.org/Subversive_Plan].
> Eclipse is version 3.4.0 (Build id I20080617-2000) [3.4.x supported
> according to http://wiki.eclipse.org/Subversive_Plan].
> Subversion is version 1.5.1 (r32289) [1.5 supported according to
>
http://www.eclipse.org/subversive/documentation/teamSupport/ merge_dialog.php].
> Subversive client is 0.7.3-I20080814-1500 [need only 0.7.2.I20080801-1500+
> according to http://www.eclipse.org/subversive/changelogs/changelog.txt].
> Subversive SVN Connectors from SVNKit 1.1.7 are 2.0.3.I20080814-1500 (need
> only 2.0.2.I20080801-1500+ according to
>
http://www.polarion.org/projects/subversive/download/eclipse /2.0/changelog.txt].
> Applies to both svnserve and apache connections, and on merge to either
> trunk or branch.
> Checkout and commit on trunk and branch work fine.
> -- Al
Hello, Al.
To have this tab please select from Window->Preferences->Team->SVN
Connector one of SVN 1.5 Compatible connectors - SVN Kit 1.2.0 or JavaHL
1.5.0.
Best regards, Alexei Goncharov.
Subversive Team.