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/t9603/cvsroot/module/a,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/t9603/cvsroot/module/a,v')
| -rw-r--r-- | t/t9603/cvsroot/module/a,v | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/t/t9603/cvsroot/module/a,v b/t/t9603/cvsroot/module/a,v new file mode 100644 index 0000000000..ba8fd5af23 --- /dev/null +++ b/t/t9603/cvsroot/module/a,v @@ -0,0 +1,74 @@ +head 1.2; +access; +symbols + A:1.2.0.2; +locks; strict; +comment @# @; + + +1.2 +date 2009.02.21.18.11.14; author tester; state Exp; +branches + 1.2.2.1; +next 1.1; + +1.1 +date 2009.02.21.18.11.43; author tester; state Exp; +branches; +next ; + +1.2.2.1 +date 2009.03.11.19.03.52; author tester; state Exp; +branches; +next 1.2.2.2; + +1.2.2.2 +date 2009.03.11.19.09.10; author tester; state Exp; +branches; +next ; + + +desc +@@ + + +1.2 +log +@Rev 2 +@ +text +@1.2 +@ + + +1.2.2.1 +log +@Rev 4 Branch A +@ +text +@d1 1 +a1 1 +1.2.2.1 +@ + + +1.2.2.2 +log +@Rev 5 Branch A +@ +text +@d1 1 +a1 1 +1.2.2.2 +@ + + +1.1 +log +@Rev 1 +@ +text +@d1 1 +a1 1 +1.1 +@ |