mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-18 23:14:51 +01:00

44 lines

417 B

Text

Raw Normal View History

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> 2009-02-23 06:08:13 +01:00			`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`
			`@@`