Author: struberg Date: Thu Aug 20 08:46:58 2009 New Revision: 806089 URL: http://svn.apache.org/viewvc?rev=806089&view=rev Log: [SCM-493] use --no-strict option while pushing. Otherwise bzr complains if there are other local modifications than the currently added
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java?rev=806089&r1=806088&r2=806089&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConstants.java Thu Aug 20 08:46:58 2009 @@ -108,6 +108,8 @@ public static final String NO_RECURSE_OPTION = "--no-recurse"; + public static final String NO_STRICT_OPTION = "--no-strict"; + public static final String MESSAGE_OPTION = "--message"; public static final String REVISION_OPTION = "--revision"; Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java?rev=806089&r1=806088&r2=806089&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java Thu Aug 20 08:46:58 2009 @@ -97,7 +97,7 @@ BazaarScmProviderRepository repository = (BazaarScmProviderRepository) repo; if ( !repository.getURI().equals( fileSet.getBasedir().getAbsolutePath() ) ) { - String[] pushCmd = new String[] { BazaarConstants.PUSH_CMD, repository.getURI() }; + String[] pushCmd = new String[] { BazaarConstants.PUSH_CMD, BazaarConstants.NO_STRICT_OPTION, repository.getURI() }; result = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), pushCmd ); }