You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by mp...@apache.org on 2006/02/23 16:51:05 UTC
svn commit: r380144 -
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
Author: mperham
Date: Thu Feb 23 07:51:00 2006
New Revision: 380144
URL: http://svn.apache.org/viewcvs?rev=380144&view=rev
Log:
PR: SCM-163
Submitted by: John Didion
Fix update command to work with changelog
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java?rev=380144&r1=380143&r2=380144&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/update/PerforceUpdateCommand.java Thu Feb 23 07:51:00 2006
@@ -51,11 +51,13 @@
params.setString( CommandParameter.TAG, tag );
CheckOutScmResult cosr = (CheckOutScmResult) command.execute( repo, files, params );
+ if ( !cosr.isSuccess() )
+ {
+ return new UpdateScmResult( cosr.getCommandLine(), cosr.getProviderMessage(), cosr.getCommandOutput(),
+ false );
+ }
- UpdateScmResult usr = new UpdateScmResult( cosr.getCommandLine(), cosr.getProviderMessage(), cosr
- .getCommandOutput(), cosr.isSuccess() );
- usr.setChanges( cosr.getCheckedOutFiles() );
- return usr;
+ return new UpdateScmResult( cosr.getCommandLine(), cosr.getCheckedOutFiles() );
}
protected ChangeLogCommand getChangeLogCommand()