You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
87 lines
2.0 KiB
87 lines
2.0 KiB
16 years ago
|
#!/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
|
||
|
|
|
||
|
|
CVSROOT="$TEST_DIRECTORY"/t9601/cvsroot
|
||
|
|
export CVSROOT
|
||
|
|
|
||
|
|
test_expect_success 'import a module with a vendor branch' '
|
||
|
|
|
||
|
|
git cvsimport -C module-git module
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_success 'check HEAD out of cvs repository' 'test_cvs_co master'
|
||
|
|
|
||
|
|
test_expect_success 'check master out of git repository' 'test_git_co master'
|
||
|
|
|
||
|
|
test_expect_success 'check a file that was imported once' '
|
||
|
|
|
||
|
|
test_cmp_branch_file master imported-once.txt
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_failure 'check a file that was imported twice' '
|
||
|
|
|
||
|
|
test_cmp_branch_file master imported-twice.txt
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_success 'check a file that was imported then modified on HEAD' '
|
||
|
|
|
||
|
|
test_cmp_branch_file master imported-modified.txt
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_success 'check a file that was imported, modified, then imported again' '
|
||
|
|
|
||
|
|
test_cmp_branch_file master imported-modified-imported.txt
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_success 'check a file that was added to HEAD then imported' '
|
||
|
|
|
||
|
|
test_cmp_branch_file master added-imported.txt
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_expect_success 'a vendor branch whose tag has been removed' '
|
||
|
|
|
||
|
|
test_cmp_branch_file master imported-anonymously.txt
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_done
|