You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by da...@apache.org on 2014/06/25 00:52:41 UTC
git commit: condition ending commit on behalf of Perforce TCK. gitexe
just does not like it
Repository: maven-scm
Updated Branches:
refs/heads/master 9a67b2b70 -> 4abc76635
condition ending commit on behalf of Perforce TCK. gitexe just does not like it
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/4abc7663
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/4abc7663
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/4abc7663
Branch: refs/heads/master
Commit: 4abc766358dbffa3f7f13ebce89edb431453a15b
Parents: 9a67b2b
Author: dantran <da...@gmail.com>
Authored: Tue Jun 24 15:50:44 2014 -0700
Committer: dantran <da...@gmail.com>
Committed: Tue Jun 24 15:50:44 2014 -0700
----------------------------------------------------------------------
.../scm/tck/command/status/StatusCommandTckTest.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/4abc7663/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
index 71ba0e3..0a6bd4f 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
@@ -92,9 +92,9 @@ public abstract class StatusCommandTckTest
// /project.xml
ScmTestCase.makeFile( getWorkingCopy(), "/project.xml", "changed project.xml" );
- addToWorkingTree( getWorkingCopy(), new File( "project.xml" ), repository );
+ addToWorkingTree( getWorkingCopy(), new File( "project.xml" ), getScmRepository() );
- commit( getWorkingCopy(), repository );
+ commit( getWorkingCopy(), getScmRepository() );
// /pom.xml
this.edit( getUpdatingCopy(), "pom.xml", null, repository );
@@ -125,8 +125,12 @@ public abstract class StatusCommandTckTest
StatusScmResult result = scmManager.getProviderByUrl( getScmUrl() )
.status( repository, new ScmFileSet( getUpdatingCopy() ) );
- //this is needed for perforce so that teardown can remove its workspace, not harm for cvs/svn/git
- commit( getUpdatingCopy(), repository );
+ //this is needed for perforce so that teardown can remove its client workspace, no harm for cvs/svn/git
+ if ( this.getScmManager().getProviderByRepository( this.getScmRepository() ).requiresEditMode() )
+ {
+ // this condition is added to make gitexe TCK happen
+ commit( getUpdatingCopy(), repository );
+ }
assertNotNull( "The command returned a null result.", result );