You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2007/08/28 20:59:13 UTC

svn commit: r570525 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java

Author: evenisse
Date: Tue Aug 28 11:59:12 2007
New Revision: 570525

URL: http://svn.apache.org/viewvc?rev=570525&view=rev
Log:
[CONTINUUM-1393] Don't merge scm results for fresh builds

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=570525&r1=570524&r2=570525&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Tue Aug 28 11:59:12 2007
@@ -112,7 +112,11 @@
             updateWorkingDirectory( context );
 
             getLogger().info( "Merging SCM results" );
-            mergeScmResults( context );
+            //CONTINUUM-1393
+            if ( !context.getBuildDefinition().isBuildFresh() )
+            {
+                mergeScmResults( context );
+            }
 
             if ( !checkScmResult( context ) )
             {