The rewrite patch was supposed to remove these scripts, but somehow we ended up removing only the supporting files for them but not the test script themselves. Remove them for real.
Signed-off-by: Junio C Hamano <gits...@pobox.com> --- * I'll queue this on top of your patch together with a few fix-up patches from Chris Rorvick. This may have been caused by your private patch e-mail mangled somewhere between us before I resent your patch, or perhaps you simply may have forgot to remove them, but at this point I do not really care where these deletions were lost---the only thing I care about is to make sure that you _meant_ to remove them in your patch (i.e. if you didn't mean to, then I am further breaking the tests in a way you did not intend to), so I'd appreciate either "Yup, these three files should be removed", or "No, they should stay; removal of their supporting data is no longer needed" from you (I and this patch expect the former, of course). By the way, Chris, we'll need your Sign-off on the three paches (t/lib-cvs.sh fix to allow cvsps v3, t9600 fix and t9604 fix). t/t9601-cvsimport-vendor-branch.sh | 85 -------------------------------------- t/t9602-cvsimport-branches-tags.sh | 78 ---------------------------------- t/t9603-cvsimport-patchsets.sh | 39 ----------------- 3 files changed, 202 deletions(-) delete mode 100755 t/t9601-cvsimport-vendor-branch.sh delete mode 100755 t/t9602-cvsimport-branches-tags.sh delete mode 100755 t/t9603-cvsimport-patchsets.sh diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh deleted file mode 100755 index 827d39f..0000000 --- a/t/t9601-cvsimport-vendor-branch.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# Description of the files in the repository: -# -# imported-once.txt: -# -# Imported once. 1.1 and 1.1.1.1 should be identical. -# -# imported-twice.txt: -# -# Imported twice. HEAD should reflect the contents of the -# second import (i.e., have the same contents as 1.1.1.2). -# -# imported-modified.txt: -# -# Imported, then modified on HEAD. HEAD should reflect the -# modification. -# -# imported-modified-imported.txt: -# -# Imported, then modified on HEAD, then imported again. -# -# added-imported.txt,v: -# -# Added with 'cvs add' to create 1.1, then imported with -# completely different contents to create 1.1.1.1, therefore the -# vendor branch was never the default branch. -# -# imported-anonymously.txt: -# -# Like imported-twice.txt, but with a vendor branch whose branch -# tag has been removed. - -test_description='git cvsimport handling of vendor branches' -. ./lib-cvs.sh - -setup_cvs_test_repository t9601 - -test_expect_success PERL 'import a module with a vendor branch' ' - - git cvsimport -C module-git module - -' - -test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co master' - -test_expect_success PERL 'check master out of git repository' 'test_git_co master' - -test_expect_success PERL 'check a file that was imported once' ' - - test_cmp_branch_file master imported-once.txt - -' - -test_expect_failure PERL 'check a file that was imported twice' ' - - test_cmp_branch_file master imported-twice.txt - -' - -test_expect_success PERL 'check a file that was imported then modified on HEAD' ' - - test_cmp_branch_file master imported-modified.txt - -' - -test_expect_success PERL 'check a file that was imported, modified, then imported again' ' - - test_cmp_branch_file master imported-modified-imported.txt - -' - -test_expect_success PERL 'check a file that was added to HEAD then imported' ' - - test_cmp_branch_file master added-imported.txt - -' - -test_expect_success PERL 'a vendor branch whose tag has been removed' ' - - test_cmp_branch_file master imported-anonymously.txt - -' - -test_done diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh deleted file mode 100755 index e1db323..0000000 --- a/t/t9602-cvsimport-branches-tags.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -# A description of the repository used for this test can be found in -# t9602/README. - -test_description='git cvsimport handling of branches and tags' -. ./lib-cvs.sh - -setup_cvs_test_repository t9602 - -test_expect_success PERL 'import module' ' - - git cvsimport -C module-git module - -' - -test_expect_success PERL 'test branch master' ' - - test_cmp_branch_tree master - -' - -test_expect_success PERL 'test branch vendorbranch' ' - - test_cmp_branch_tree vendorbranch - -' - -test_expect_failure PERL 'test branch B_FROM_INITIALS' ' - - test_cmp_branch_tree B_FROM_INITIALS - -' - -test_expect_failure PERL 'test branch B_FROM_INITIALS_BUT_ONE' ' - - test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE - -' - -test_expect_failure PERL 'test branch B_MIXED' ' - - test_cmp_branch_tree B_MIXED - -' - -test_expect_success PERL 'test branch B_SPLIT' ' - - test_cmp_branch_tree B_SPLIT - -' - -test_expect_failure PERL 'test tag vendortag' ' - - test_cmp_branch_tree vendortag - -' - -test_expect_success PERL 'test tag T_ALL_INITIAL_FILES' ' - - test_cmp_branch_tree T_ALL_INITIAL_FILES - -' - -test_expect_failure PERL 'test tag T_ALL_INITIAL_FILES_BUT_ONE' ' - - test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE - -' - -test_expect_failure PERL 'test tag T_MIXED' ' - - test_cmp_branch_tree T_MIXED - -' - - -test_done diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh deleted file mode 100755 index 52034c8..0000000 --- a/t/t9603-cvsimport-patchsets.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# Structure of the test cvs repository -# -# Message File:Content Commit Time -# Rev 1 a: 1.1 2009-02-21 19:11:43 +0100 -# Rev 2 a: 1.2 b: 1.1 2009-02-21 19:11:14 +0100 -# Rev 3 b: 1.2 2009-02-21 19:11:43 +0100 -# -# As you can see the commit of Rev 3 has the same time as -# Rev 1 this leads to a broken import because of a cvsps -# bug. - -test_description='git cvsimport testing for correct patchset estimation' -. ./lib-cvs.sh - -setup_cvs_test_repository t9603 - -test_expect_failure 'import with criss cross times on revisions' ' - - git cvsimport -p"-x" -C module-git module && - (cd module-git && - git log --pretty=format:%s > ../actual-master && - git log A~2..A --pretty="format:%s %ad" -- > ../actual-A && - echo "" >> ../actual-master && - echo "" >> ../actual-A - ) && - echo "Rev 4 -Rev 3 -Rev 2 -Rev 1" > expect-master && - test_cmp actual-master expect-master && - - echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000 -Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A && - test_cmp actual-A expect-A -' - -test_done -- 1.8.1.421.g6236851 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
