Author: olamy
Date: Sat Mar 21 22:09:17 2009
New Revision: 757034
URL: http://svn.apache.org/viewvc?rev=757034&view=rev
Log:
[SCM-440] <includes> and <excludes> do not seem to work correctly during
scm:update
Submitted by Ringo De Smet
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java?rev=757034&r1=757033&r2=757034&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/AbstractCvsUpdateCommand.java
Sat Mar 21 22:09:17 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmVersion;
@@ -54,6 +58,16 @@
{
cl.createArg().setValue( "-r" + version.getName() );
}
+
+ List files = fileSet.getFileList();
+ if ( !files.isEmpty() )
+ {
+ Iterator fileIterator = files.iterator();
+ while ( fileIterator.hasNext() )
+ {
+ cl.createArg().setValue( ( (File) fileIterator.next()
).getPath() );
+ }
+ }
if ( getLogger().isInfoEnabled() )
{
