Author: vsiveton Date: Mon Sep 1 08:51:49 2008 New Revision: 691002 URL: http://svn.apache.org/viewvc?rev=691002&view=rev Log: SCM-361: make cvs tag -F optional Submitted by: Benoit Decherf Reviewed by: Vincent Siveton
o patch applied 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/tag/AbstractCvsTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo 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/tag/AbstractCvsTagCommand.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/tag/AbstractCvsTagCommand.java?rev=691002&r1=691001&r2=691002&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/tag/AbstractCvsTagCommand.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/tag/AbstractCvsTagCommand.java Mon Sep 1 08:51:49 2008 @@ -31,6 +31,8 @@ import org.apache.maven.scm.provider.cvslib.command.CvsCommand; import org.apache.maven.scm.provider.cvslib.command.CvsCommandUtils; import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository; +import org.apache.maven.scm.provider.cvslib.util.CvsUtil; +import org.apache.maven.scm.providers.cvslib.settings.Settings; import org.codehaus.plexus.util.cli.Commandline; /** @@ -50,7 +52,11 @@ Commandline cl = CvsCommandUtils.getBaseCommand( "tag", repository, fileSet, false ); - cl.createArg().setValue( "-F" ); + Settings settings = CvsUtil.getSettings(); + if ( settings.isUseForceTag() ) + { + cl.createArg().setValue( "-F" ); + } cl.createArg().setValue( "-c" ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo?rev=691002&r1=691001&r2=691002&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo Mon Sep 1 08:51:49 2008 @@ -70,6 +70,15 @@ <multiplicity>*</multiplicity> </association> </field> + <field> + <name>useForceTag</name> + <version>1.0.0+</version> + <type>boolean</type> + <defaultValue>true</defaultValue> + <description><![CDATA[ + Move tag if it already exists. + ]]></description> + </field> </fields> </class> </classes>