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 09:13:15 UTC
git commit: cleaner work around for Perforce by allowing downstream
to override the decision to commit the change
Repository: maven-scm
Updated Branches:
refs/heads/master 4abc76635 -> cc0b8fdb4
cleaner work around for Perforce by allowing downstream to override the
decision to commit the change
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/cc0b8fdb
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/cc0b8fdb
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/cc0b8fdb
Branch: refs/heads/master
Commit: cc0b8fdb448d8d704a0ee33b1fe8f724976fe625
Parents: 4abc766
Author: dantran <da...@gmail.com>
Authored: Wed Jun 25 00:11:46 2014 -0700
Committer: dantran <da...@gmail.com>
Committed: Wed Jun 25 00:11:46 2014 -0700
----------------------------------------------------------------------
.../scm/tck/command/status/StatusCommandTckTest.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/cc0b8fdb/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 0a6bd4f..642bdf4 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
@@ -68,6 +68,11 @@ public abstract class StatusCommandTckTest
assertEquals( "Expected 2 files in the committed files list " + committedFiles, 2, committedFiles.size() );
}
+ protected boolean commitUpdateCopy()
+ {
+ return false;
+ }
+
public void testStatusCommand()
throws Exception
@@ -125,14 +130,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 client workspace, no harm for cvs/svn/git
- if ( this.getScmManager().getProviderByRepository( this.getScmRepository() ).requiresEditMode() )
+ if ( this.commitUpdateCopy() )
{
- // this condition is added to make gitexe TCK happen
+ //this is needed for perforce so that teardown can remove its client workspace, no harm for cvs/svn/git
commit( getUpdatingCopy(), repository );
}
-
assertNotNull( "The command returned a null result.", result );
assertResultIsSuccess( result );