You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/06 15:52:55 UTC
svn commit: r723992 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0042/ resources/it0044/
resources/it0045/ resources/it0046/ resources/it0049/ resources/mng-0095/
resources/mng-0249/ resources...
Author: bentmann
Date: Sat Dec 6 06:52:54 2008
New Revision: 723992
URL: http://svn.apache.org/viewvc?rev=723992&view=rev
Log:
o Renamed ITs to match their corresponding JIRA issue
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java (contents, props changed)
- copied, changed from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java (contents, props changed)
- copied, changed from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java (contents, props changed)
- copied, changed from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java (contents, props changed)
- copied, changed from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java (contents, props changed)
- copied, changed from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0095/ (props changed)
- copied from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0046/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0249/ (props changed)
- copied from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0042/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0282/ (props changed)
- copied from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0045/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0557/ (props changed)
- copied from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0044/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/ (props changed)
- copied from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0049/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0042/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0044/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0045/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0046/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0049/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=723992&r1=723991&r2=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Sat Dec 6 06:52:54 2008
@@ -212,6 +212,8 @@
suite.addTestSuite( MavenITmng0866EvaluateDefaultValueTest.class );
suite.addTestSuite( MavenITmng0848SystemPropOverridesDefaultValueTest.class );
suite.addTestSuite( MavenITmng0836PluginParentResolutionTest.class );
+ suite.addTestSuite( MavenITmng0674PluginParameterAliasTest.class );
+ suite.addTestSuite( MavenITmng0557UserSettingsCliOptionTest.class );
suite.addTestSuite( MavenITmng0522PluginMgmtConfigTest.class );
suite.addTestSuite( MavenITmng0507ArtifactRelocationTest.class );
suite.addTestSuite( MavenITmng0505VersionRangeTest.class );
@@ -220,6 +222,9 @@
suite.addTestSuite( MavenITmng0469ReportConfigTest.class );
suite.addTestSuite( MavenITmng0377PluginLookupFromPrefixTest.class );
suite.addTestSuite( MavenITmng0294MergeGlobalAndUserSettingsTest.class );
+ suite.addTestSuite( MavenITmng0282NonReactorExecWhenProjectIndependentTest.class );
+ suite.addTestSuite( MavenITmng0249ResolveDepsFromReactorTest.class );
+ suite.addTestSuite( MavenITmng0095ReactorFailureBehaviorTest.class );
suite.addTestSuite( MavenIT0142DirectDependencyScopesTest.class );
suite.addTestSuite( MavenIT0140Test.class );
suite.addTestSuite( MavenIT0139Test.class );
@@ -270,13 +275,8 @@
suite.addTestSuite( MavenIT0053Test.class );
suite.addTestSuite( MavenIT0052Test.class );
suite.addTestSuite( MavenIT0051Test.class );
- suite.addTestSuite( MavenIT0049Test.class );
suite.addTestSuite( MavenIT0047Test.class );
- suite.addTestSuite( MavenIT0046Test.class );
- suite.addTestSuite( MavenIT0045Test.class );
- suite.addTestSuite( MavenIT0044Test.class );
suite.addTestSuite( MavenIT0043Test.class );
- suite.addTestSuite( MavenIT0042Test.class );
suite.addTestSuite( MavenIT0041Test.class );
suite.addTestSuite( MavenIT0040Test.class );
suite.addTestSuite( MavenIT0039Test.class );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java?rev=723992&r1=723991&r2=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040Test.java Sat Dec 6 06:52:54 2008
@@ -24,6 +24,12 @@
import java.io.File;
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-598">MNG-598</a>.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
public class MavenIT0040Test
extends AbstractMavenIntegrationTestCase
{
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java?rev=723992&r1=723991&r2=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java Sat Dec 6 06:52:54 2008
@@ -24,6 +24,12 @@
import java.io.File;
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-598">MNG-598</a>.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
public class MavenIT0041Test
extends AbstractMavenIntegrationTestCase
{
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java (from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java&r1=723983&r2=723992&rev=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0046Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java Sat Dec 6 06:52:54 2008
@@ -26,7 +26,13 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0046Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-95">MNG-95</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0095ReactorFailureBehaviorTest
extends AbstractMavenIntegrationTestCase
{
@@ -34,10 +40,10 @@
* Test fail-never reactor behavior. Forces an exception to be thrown in
* the first module, but checks that the second modules is built.
*/
- public void testit0046()
+ public void testitMNG95()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0046" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0095" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins", "maven-it-it-plugin", "1.0", "maven-plugin" );
List cliOptions = new ArrayList();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java (from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java&r1=723983&r2=723992&rev=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0042Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java Sat Dec 6 06:52:54 2008
@@ -24,17 +24,23 @@
import java.io.File;
-public class MavenIT0042Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-249">MNG-249</a>.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
+public class MavenITmng0249ResolveDepsFromReactorTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that the reactor can establish the artifact location of known projects for dependencies
*/
- public void testit0042()
+ public void testitMNG249()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0042" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0249" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java (from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java&r1=723983&r2=723992&rev=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0045Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java Sat Dec 6 06:52:54 2008
@@ -26,17 +26,23 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0045Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-282">MNG-282</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test non-reactor behavior when plugin declares "@requiresProject false"
*/
- public void testit0045()
+ public void testitMNG282()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0045" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0282" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-no-project", "1.0", "maven-plugin" );
List cliOptions = new ArrayList();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java (from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java&r1=723983&r2=723992&rev=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0044Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java Sat Dec 6 06:52:54 2008
@@ -26,17 +26,23 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0044Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-557">MNG-557</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0557UserSettingsCliOptionTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test --settings CLI option
*/
- public void testit0044()
+ public void testitMNG557()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0044" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0557" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java (from r723983, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java&r1=723983&r2=723992&rev=723992&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0049Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java Sat Dec 6 06:52:54 2008
@@ -24,20 +24,24 @@
import java.io.File;
-public class MavenIT0049Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-674">MNG-674</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0674PluginParameterAliasTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test parameter alias usage.
*/
- public void testit0049()
+ public void testitMNG674()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0049" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0674" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- //todo: i don't think we need to delete this plugin
- //verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.assertFilePresent( "target/touchFile.txt" );
verifier.verifyErrorFreeLog();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0095/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0249/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0282/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0557/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/
------------------------------------------------------------------------------
svn:mergeinfo =