diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2009-02-23 06:08:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-02-23 21:56:47 -0800 |
| commit | b225290445210bbdef207e42de21edbf8baa24aa (patch) | |
| tree | 1cd578324e842479470ea61e9b7bc2e19497db4c /t/t9601/cvsroot/module/imported-once.txt,v | |
| parent | Test contents of entire cvsimported "master" tree contents (diff) | |
| download | tgif-b225290445210bbdef207e42de21edbf8baa24aa.tar.xz | |
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>
Diffstat (limited to 't/t9601/cvsroot/module/imported-once.txt,v')
| -rw-r--r-- | t/t9601/cvsroot/module/imported-once.txt,v | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/t/t9601/cvsroot/module/imported-once.txt,v b/t/t9601/cvsroot/module/imported-once.txt,v new file mode 100644 index 0000000000..c5dd82b12d --- /dev/null +++ b/t/t9601/cvsroot/module/imported-once.txt,v @@ -0,0 +1,43 @@ +head 1.1; +branch 1.1.1; +access; +symbols + vtag-1:1.1.1.1 + vbranchA:1.1.1; +locks; strict; +comment @# @; + + +1.1 +date 2004.02.09.15.43.13; author kfogel; state Exp; +branches + 1.1.1.1; +next ; + +1.1.1.1 +date 2004.02.09.15.43.13; author kfogel; state Exp; +branches; +next ; + + +desc +@@ + + +1.1 +log +@Initial revision +@ +text +@This is vtag-1 (on vbranchA) of imported-once.txt. +@ + + +1.1.1.1 +log +@Import (vbranchA, vtag-1). +@ +text +@@ + + |