diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-07-29 10:39:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-29 10:39:57 -0700 |
| commit | b65954d1720960f888d1d51e51befb84e05018eb (patch) | |
| tree | 179bcfc631aef8b3617461a9639acd5fc2a49bff /t/t9601/cvsroot/module/imported-twice.txt,v | |
| parent | Add a reminder test case for a merge with F/D transition (diff) | |
| parent | t/t9600: remove exit after test_done (diff) | |
| download | tgif-b65954d1720960f888d1d51e51befb84e05018eb.tar.xz | |
Merge branch 'hv/cvsps-tests'
* hv/cvsps-tests:
t/t9600: remove exit after test_done
cvsimport: extend testcase about patchset order to contain branches
cvsimport: add test illustrating a bug in cvsps
Add a test of "git cvsimport"'s handling of tags and branches
Add some tests of git-cvsimport's handling of vendor branches
Test contents of entire cvsimported "master" tree contents
Use CVS's -f option if available (ignore user's ~/.cvsrc file)
Start a library for cvsimport-related tests
Diffstat (limited to 't/t9601/cvsroot/module/imported-twice.txt,v')
| -rw-r--r-- | t/t9601/cvsroot/module/imported-twice.txt,v | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/t/t9601/cvsroot/module/imported-twice.txt,v b/t/t9601/cvsroot/module/imported-twice.txt,v new file mode 100644 index 0000000000..d1f3f1b344 --- /dev/null +++ b/t/t9601/cvsroot/module/imported-twice.txt,v @@ -0,0 +1,60 @@ +head 1.1; +branch 1.1.1; +access; +symbols + vtag-2:1.1.1.2 + 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 1.1.1.2; + +1.1.1.2 +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-twice.txt. +@ + + +1.1.1.1 +log +@Import (vbranchA, vtag-1). +@ +text +@@ + + +1.1.1.2 +log +@Import (vbranchA, vtag-2). +@ +text +@d1 1 +a1 1 +This is vtag-2 (on vbranchA) of imported-twice.txt. +@ + + |