Code

Add some tests of git-cvsimport's handling of vendor branches
authorMichael Haggerty <mhagger@alum.mit.edu>
Mon, 23 Feb 2009 05:08:13 +0000 (06:08 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Feb 2009 05:56:47 +0000 (21:56 -0800)
commitb225290445210bbdef207e42de21edbf8baa24aa
tree1cd578324e842479470ea61e9b7bc2e19497db4c
parentcefa318ddbc8565b50ac2eb9b6aab93e26cc0abe
Add some tests of git-cvsimport's handling of vendor branches

CVS's handling of vendor branches is tricky; add some tests to check
whether revisions added via "cvs imports" then imported to git via
"git cvsimport" are reflected correctly on master.

One of these tests fail and is therefore marked "test_expect_failure".
Cvsimport doesn't realize that subsequent changes on a vendor branch
affect master as long as the vendor branch is the default branch.

The test CVS repository used for these tests is derived from cvs2svn's
test suite.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9601-cvsimport-vendor-branch.sh [new file with mode: 0755]
t/t9601/cvsroot/.gitattributes [new file with mode: 0644]
t/t9601/cvsroot/CVSROOT/.gitignore [new file with mode: 0644]
t/t9601/cvsroot/module/added-imported.txt,v [new file with mode: 0644]
t/t9601/cvsroot/module/imported-anonymously.txt,v [new file with mode: 0644]
t/t9601/cvsroot/module/imported-modified-imported.txt,v [new file with mode: 0644]
t/t9601/cvsroot/module/imported-modified.txt,v [new file with mode: 0644]
t/t9601/cvsroot/module/imported-once.txt,v [new file with mode: 0644]
t/t9601/cvsroot/module/imported-twice.txt,v [new file with mode: 0644]