mirror of
https://github.com/git/git.git
synced 2024-11-12 20:23:02 +01:00
b225290445
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>
44 lines
496 B
Text
44 lines
496 B
Text
head 1.1;
|
|
access;
|
|
symbols
|
|
vtag-4:1.1.1.1
|
|
vbranchA:1.1.1;
|
|
locks; strict;
|
|
comment @# @;
|
|
|
|
|
|
1.1
|
|
date 2004.02.09.15.43.15; author kfogel; state Exp;
|
|
branches
|
|
1.1.1.1;
|
|
next ;
|
|
|
|
1.1.1.1
|
|
date 2004.02.09.15.43.16; author kfogel; state Exp;
|
|
branches;
|
|
next ;
|
|
|
|
|
|
desc
|
|
@@
|
|
|
|
|
|
1.1
|
|
log
|
|
@Add a file to the working copy.
|
|
@
|
|
text
|
|
@Adding this file, before importing it with different contents.
|
|
@
|
|
|
|
|
|
1.1.1.1
|
|
log
|
|
@Import (vbranchA, vtag-4).
|
|
@
|
|
text
|
|
@d1 1
|
|
a1 1
|
|
This is vtag-4 (on vbranchA) of added-then-imported.txt.
|
|
@
|
|
|