├── .dockerignore ├── cvs2svn_rcsparse ├── UPSTREAM_SOURCE ├── test-data │ ├── empty-file,v │ └── empty-file.out ├── __init__.py └── README.cvs2svn ├── test-data ├── symbol-mess-cvsrepos │ ├── symbol-mess-symbol-hints.txt │ ├── symbol-mess-parent-hints.txt │ ├── symbol-mess-parent-hints-wildcards.txt │ ├── symbol-mess-parent-hints-invalid.txt │ ├── symbol-mess-path-hints.txt │ └── dir │ │ ├── file2,v │ │ └── file3,v ├── empty-directories-cvsrepos │ ├── direct │ │ ├── empty-directory │ │ │ ├── README.txt │ │ │ └── empty-subdirectory │ │ │ │ └── README.txt │ │ └── b.txt,v │ ├── import │ │ ├── empty-directory │ │ │ ├── README.txt │ │ │ └── empty-subdirectory │ │ │ │ └── README.txt │ │ └── d.txt,v │ ├── root-empty-directory │ │ ├── empty-subdirectory │ │ │ └── README.txt │ │ └── README.txt │ ├── indirect │ │ ├── empty-directory │ │ │ ├── README.txt │ │ │ └── empty-subdirectory │ │ │ │ └── README.txt │ │ └── subdirectory │ │ │ └── c.txt,v │ └── a.txt,v ├── non-ascii-cvsrepos │ └── single-files │ │ ├── .cvsignore,v │ │ └── twoquick,v ├── no-revs-file-cvsrepos │ └── proj │ │ ├── no-revs.txt,v │ │ └── one-rev.txt,v ├── eol-mime-cvsrepos │ ├── mime.types │ ├── README │ ├── auto-props │ ├── foo.bin,v │ ├── foo.asc,v │ ├── foo.txt,v │ ├── foo.xml,v │ ├── foo.zip,v │ ├── foo.UPCASE1,v │ ├── foo.UPCASE2,v │ ├── foo.csv,v │ └── foo.dbf,v ├── requires-cvs-cvsrepos │ ├── README │ ├── atsign-add,v │ └── space-in-authorname,v ├── tag-with-no-revision-cvsrepos │ ├── README │ └── file.txt,v ├── missing-deltatext-cvsrepos │ ├── README │ └── file001,v ├── symlinks-cvsrepos │ └── proj │ │ ├── README.txt │ │ ├── dir1 │ │ └── README.txt │ │ └── file.txt,v ├── pass5-when-to-fill-cvsrepos │ ├── README │ └── root │ │ ├── c,v │ │ ├── a,v │ │ └── b,v ├── main-cvsrepos │ ├── cvs2git.options │ ├── cvs2hg.options │ ├── cvs2svn.options │ ├── single-files │ │ ├── twoquick,v │ │ ├── "double-double-quotes",v │ │ ├── can't-avoid-quotes,v │ │ ├── quotin'-in-dirname │ │ │ └── foo,v │ │ ├── single-double-quote",v │ │ ├── attr-exec,v │ │ └── space fname,v │ ├── full-prune-reappear │ │ ├── appears-later,v │ │ └── sub │ │ │ └── Attic │ │ │ ├── second,v │ │ │ └── first,v │ ├── partial-prune │ │ ├── permanent,v │ │ └── sub │ │ │ └── Attic │ │ │ ├── second,v │ │ │ └── first,v │ ├── interleaved │ │ ├── 1,v │ │ ├── 2,v │ │ ├── 3,v │ │ ├── 4,v │ │ ├── 5,v │ │ ├── a,v │ │ ├── b,v │ │ ├── c,v │ │ ├── d,v │ │ └── e,v │ ├── full-prune │ │ └── Attic │ │ │ ├── second,v │ │ │ └── first,v │ ├── proj │ │ └── sub2 │ │ │ └── Attic │ │ │ └── branch_B_MIXED_only,v │ ├── cvs2svn-crossproject.options │ └── cvs2svn-multiproject.options ├── invalid-symbol-cvsrepos │ ├── file.txt,v │ ├── cvs2svn-ignore2.options │ └── cvs2svn-ignore.options ├── mirror-keyerror2-cvsrepos │ └── proj │ │ ├── dir2 │ │ ├── file3.txt,v │ │ └── file2.txt,v │ │ └── dir1 │ │ └── file1.txt,v ├── file-directory-conflict-cvsrepos │ └── proj │ │ ├── name,v │ │ └── name │ │ └── name2,v ├── enroot-race-obo-cvsrepos │ └── file,v ├── delete-cvsignore-cvsrepos │ └── proj │ │ ├── file.txt,v │ │ └── Attic │ │ └── .cvsignore,v ├── double-branch-delete-cvsrepos │ ├── SoftSet.java,v │ ├── Streams.java,v │ └── IMarshalledValue.java,v ├── missing-vendor-branch-cvsrepos │ └── file,v ├── tagging-after-delete-cvsrepos │ └── test │ │ ├── a,v │ │ └── Attic │ │ └── b,v ├── add-cvsignore-to-branch-cvsrepos │ └── dir │ │ ├── .cvsignore,v │ │ └── file.txt,v ├── attic-directory-conflict-cvsrepos │ └── proj │ │ ├── file1 │ │ └── file2.txt,v │ │ └── Attic │ │ └── file1,v ├── file-in-attic-too-cvsrepos │ ├── file.txt,v │ └── Attic │ │ └── file.txt,v ├── unicode-log-cvsrepos │ └── testunicode,v ├── eol-variants-cvsrepos │ └── proj │ │ └── file.txt,v ├── invalid-closings-on-trunk-cvsrepos │ └── proj │ │ ├── a.txt,v │ │ ├── b.txt,v │ │ ├── deleted-on-vendor-branch.txt,v │ │ └── trunk-changed-later.txt,v ├── branch-from-deleted-1-1-cvsrepos │ └── proj │ │ ├── a.txt,v │ │ ├── Attic │ │ └── c.txt,v │ │ └── b.txt,v ├── many-deletes-cvsrepos │ └── proj │ │ ├── a.txt,v │ │ └── Attic │ │ ├── f.txt,v │ │ ├── d.txt,v │ │ ├── e.txt,v │ │ ├── c.txt,v │ │ └── b.txt,v ├── mirror-keyerror3-cvsrepos │ └── proj │ │ ├── file1.txt,v │ │ └── subdir │ │ ├── file3.txt,v │ │ ├── file2.txt,v │ │ └── Attic │ │ └── file4.txt,v ├── cvsignore-cvsrepos │ └── proj │ │ ├── file.txt,v │ │ ├── .cvsignore,v │ │ └── subdir │ │ └── .cvsignore,v ├── add-on-branch-cvsrepos │ └── proj │ │ ├── a.txt,v │ │ ├── b.txt,v │ │ ├── Attic │ │ └── c.txt,v │ │ └── d.txt,v ├── move-parent-cvsrepos │ ├── file2,v │ └── file1,v ├── branch-delete-first-cvsrepos │ ├── README.txt │ └── file,v ├── vendor-branch-sameness-cvsrepos │ └── proj │ │ ├── d.txt,v │ │ ├── a.txt,v │ │ ├── c.txt,v │ │ ├── b.txt,v │ │ └── e.txt,v ├── internal-co-keywords-cvsrepos │ └── dir │ │ ├── kk.txt,v │ │ ├── ko.txt,v │ │ ├── kv.txt,v │ │ └── kv-deleted.txt,v ├── repeatedly-defined-symbols-cvsrepos │ └── proj │ │ └── default,v ├── branch-from-vendor-branch-cvsrepos │ ├── branch-from-vendor-branch-symbol-hints.txt │ └── data,v ├── phoenix-cvsrepos │ ├── file.txt,v │ └── Attic │ │ ├── added-on-branch.txt,v │ │ └── added-on-branch2.txt,v ├── resync-pass2-pull-forward-cvsrepos │ ├── file1.txt,v │ └── file2.txt,v ├── resync-pass2-push-backward-cvsrepos │ ├── file1.txt,v │ └── file2.txt,v ├── mirror-keyerror-cvsrepos │ └── powerpc │ │ ├── bits │ │ └── Attic │ │ │ └── file2.txt,v │ │ └── file1.txt,v ├── resync-bug-cvsrepos │ ├── a,v │ └── b,v ├── nasty-graphs-cvsrepos │ ├── AB-loop │ │ ├── a.txt,v │ │ └── b.txt,v │ ├── ABC-loop │ │ ├── a.txt,v │ │ ├── b.txt,v │ │ └── c.txt,v │ ├── ABC-passthru-loop │ │ ├── a.txt,v │ │ ├── b.txt,v │ │ └── c.txt,v │ ├── ABCD-passthru-loop │ │ ├── a.txt,v │ │ ├── b.txt,v │ │ ├── c.txt,v │ │ └── d.txt,v │ └── AB-double-passthru-loop │ │ ├── a.txt,v │ │ └── b.txt,v ├── commit-dependencies-cvsrepos │ ├── interleaved │ │ ├── file2,v │ │ └── file1,v │ └── multi-branch │ │ ├── file1,v │ │ └── file2,v ├── issue-106-cvsrepos │ ├── a.txt,v │ └── d │ │ └── b.txt,v ├── add-on-branch2-cvsrepos │ └── file1,v ├── issue-99-cvsrepos │ ├── file1,v │ └── file2,v ├── split-branch-cvsrepos │ ├── README │ └── module │ │ ├── branched-from-trunk,v │ │ └── branched-from-branch,v ├── branch-from-empty-dir-cvsrepos │ └── proj │ │ ├── subdir │ │ └── Attic │ │ │ └── b.txt,v │ │ └── a.txt,v ├── empty-trunk-cvsrepos │ └── root │ │ └── Attic │ │ └── a_file,v ├── double-add-cvsrepos │ ├── seemingly-irrelevant-file.txt,v │ ├── Attic │ │ └── file2.txt,v │ └── file.txt,v ├── double-fill-cvsrepos │ ├── Attic │ │ └── oldfile.txt,v │ ├── file.txt,v │ └── otherfile.txt,v ├── log-message-eols-cvsrepos │ └── lottalogs,v ├── symbolic-name-overfill-cvsrepos │ └── proj │ │ ├── file.txt,v │ │ └── Attic │ │ └── file-added-on-branch.txt,v ├── CVSROOT │ └── README ├── preferred-parent-cycle-cvsrepos │ └── dir │ │ ├── file1,v │ │ ├── file2,v │ │ └── file3,v ├── overlapping-branch-cvsrepos │ ├── nonoverlapping-branch,v │ └── overlapping-branch,v ├── double-fill2-cvsrepos │ └── proj │ │ ├── d.txt,v │ │ ├── c.txt,v │ │ ├── b.txt,v │ │ └── a.txt,v ├── revision-reorder-bug-cvsrepos │ └── file.txt,v ├── resync-misgroups-cvsrepos │ ├── httpp │ │ ├── .cvsignore,v │ │ ├── TODO,v │ │ ├── BUILDING,v │ │ └── README,v │ ├── thread │ │ ├── .cvsignore,v │ │ ├── TODO,v │ │ ├── README,v │ │ └── BUILDING,v │ └── README ├── default-branches-cvsrepos │ └── proj │ │ ├── added-then-imported.txt,v │ │ └── e.txt,v ├── bogus-tag-cvsrepos │ └── bogus-tag,v ├── keywords-cvsrepos │ ├── foo.kb,v │ ├── foo.kk,v │ ├── foo.ko,v │ ├── foo.kv,v │ ├── foo.kkv,v │ ├── foo.default,v │ └── foo.kkvl,v ├── timestamp-chaos-cvsrepos │ └── proj │ │ ├── file1.txt,v │ │ └── file2.txt,v ├── ctrl-char-in-log-cvsrepos │ └── ctrl-char-in-log,v ├── trunk-readd-cvsrepos │ └── root │ │ └── b_file,v ├── vendor-1-1-non-root-cvsrepos │ └── file001,v ├── unlabeled-branch-cvsrepos │ ├── proj │ │ └── a.txt,v │ └── cvs2svn-ignore.options ├── leftover-revs-cvsrepos │ └── file.txt,v ├── vendor-branch-delete-add-cvsrepos │ └── proj │ │ └── file.txt,v ├── multiply-defined-symbols-cvsrepos │ ├── proj │ │ └── default,v │ ├── cvs2svn-ignore.options │ └── cvs2svn-rename.options ├── native-eol-cvsrepos │ └── foo.txt,v ├── enroot-race-cvsrepos │ └── proj │ │ ├── a.txt,v │ │ └── b.txt,v ├── compose-tag-three-sources-cvsrepos │ ├── tagged-on-b1,v │ ├── tagged-on-b2,v │ ├── tagged-on-trunk-1.1,v │ ├── tagged-on-trunk-1.2-a,v │ └── tagged-on-trunk-1.2-b,v ├── bogus-branch-copy-cvsrepos │ ├── file1.txt,v │ ├── Attic │ │ └── file3.txt,v │ └── file2.txt,v ├── repeated-deltatext-cvsrepos │ └── file.txt,v ├── peer-path-pruning-cvsrepos │ ├── bar │ │ ├── five.txt,v │ │ └── six.txt,v │ ├── one.txt,v │ ├── two.txt,v │ └── foo │ │ ├── four.txt,v │ │ └── three.txt,v ├── crossed-branches-cvsrepos │ └── proj │ │ ├── file1.txt,v │ │ └── file2.txt,v ├── double-delete-cvsrepos │ └── twice-removed,v ├── issue-100-cvsrepos │ ├── file1.txt,v │ └── file2.txt,v └── tagged-branch-n-trunk-cvsrepos │ └── b.txt,v ├── svntest └── update.sh ├── .gitignore ├── cvs2svn_lib ├── Makefile ├── __init__.py ├── metadata.py ├── version.py ├── test │ └── sort-test └── key_generator.py ├── MANIFEST.in ├── contrib └── __init__.py ├── dist.sh ├── COMMITTERS.md ├── Dockerfile └── .mailmap /.dockerignore: -------------------------------------------------------------------------------- 1 | .git 2 | .gitignore 3 | build 4 | *-tmp 5 | *.tar.gz 6 | -------------------------------------------------------------------------------- /cvs2svn_rcsparse/UPSTREAM_SOURCE: -------------------------------------------------------------------------------- 1 | http://viewvc.tigris.org/svn/viewvc/trunk/lib/vclib/ccvs/rcsparse@2971 2 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/symbol-mess-symbol-hints.txt: -------------------------------------------------------------------------------- 1 | 0 MOSTLY_BRANCH branch . . 2 | 0 MOSTLY_TAG tag . . 3 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/direct/empty-directory/README.txt: -------------------------------------------------------------------------------- 1 | This empty directory should be created when b.txt is created. 2 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/import/empty-directory/README.txt: -------------------------------------------------------------------------------- 1 | This empty directory should be created when d.txt is created. 2 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/root-empty-directory/empty-subdirectory/README.txt: -------------------------------------------------------------------------------- 1 | This directory should be created when its parent is created. 2 | -------------------------------------------------------------------------------- /cvs2svn_rcsparse/test-data/empty-file,v: -------------------------------------------------------------------------------- 1 | head ; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 9 | desc 10 | @@ 11 | -------------------------------------------------------------------------------- /test-data/non-ascii-cvsrepos/single-files/.cvsignore,v: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/mhagger/cvs2svn/HEAD/test-data/non-ascii-cvsrepos/single-files/.cvsignore,v -------------------------------------------------------------------------------- /test-data/no-revs-file-cvsrepos/proj/no-revs.txt,v: -------------------------------------------------------------------------------- 1 | head ; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 9 | desc 10 | @@ 11 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/symbol-mess-parent-hints.txt: -------------------------------------------------------------------------------- 1 | 0 MOSTLY_BRANCH branch . . 2 | 0 MOSTLY_TAG tag . . 3 | 0 BRANCH_WITH_COMMIT branch . BRANCH 4 | -------------------------------------------------------------------------------- /cvs2svn_rcsparse/test-data/empty-file.out: -------------------------------------------------------------------------------- 1 | set_locking('strict') 2 | set_comment('# ') 3 | admin_completed() 4 | tree_completed() 5 | set_description('') 6 | parse_completed() 7 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/indirect/empty-directory/README.txt: -------------------------------------------------------------------------------- 1 | This directory should be created when the addition of c.txt triggers 2 | the creation of its parent. 3 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/symbol-mess-parent-hints-wildcards.txt: -------------------------------------------------------------------------------- 1 | . MOSTLY_BRANCH branch . . 2 | . MOSTLY_TAG tag . . 3 | . BRANCH_WITH_COMMIT . . BRANCH 4 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/indirect/empty-directory/empty-subdirectory/README.txt: -------------------------------------------------------------------------------- 1 | This directory should be created when its parent is created, namely 2 | when c.txt is added. 3 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/mime.types: -------------------------------------------------------------------------------- 1 | text/xml xml 2 | application/zip zip 3 | text/csv csv 4 | application/what-is-dbf dbf 5 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/symbol-mess-parent-hints-invalid.txt: -------------------------------------------------------------------------------- 1 | 0 MOSTLY_BRANCH branch . . 2 | 0 MOSTLY_TAG tag . . 3 | 0 BRANCH_WITH_COMMIT branch . BLOCKED_BY_BRANCH 4 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/direct/empty-directory/empty-subdirectory/README.txt: -------------------------------------------------------------------------------- 1 | This directory should be created when its parent directory is created, 2 | namely when b.txt is added. 3 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/import/empty-directory/empty-subdirectory/README.txt: -------------------------------------------------------------------------------- 1 | This directory should be created when its parent directory is created, 2 | namely when d.txt is added. 3 | -------------------------------------------------------------------------------- /test-data/requires-cvs-cvsrepos/README: -------------------------------------------------------------------------------- 1 | This repository tests that the --use-cvs flag allows cvs2svn to 2 | correctly convert some files that would be troublesome for RCS. 3 | See issues 4, 11, and 29. 4 | -------------------------------------------------------------------------------- /svntest/update.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | set -ex 3 | # Update the svntest library from Subversion's subversion 4 | svn export --force http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline/svntest . 5 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | # Files that git should ignore in any directory: 2 | *.pyc 3 | *.pyo 4 | val-tags 5 | 6 | # Ignores in the project root: 7 | /cvs2git-tmp 8 | /cvs2hg-tmp 9 | /cvs2svn-tmp 10 | /*.tar.gz 11 | /svntest 12 | -------------------------------------------------------------------------------- /cvs2svn_rcsparse/__init__.py: -------------------------------------------------------------------------------- 1 | # This file causes Python to treat its containing directory it as a 2 | # package. Please note that the contents of this file differ from 3 | # those of the __init__.py file distributed with ViewVC. 4 | 5 | -------------------------------------------------------------------------------- /test-data/tag-with-no-revision-cvsrepos/README: -------------------------------------------------------------------------------- 1 | This repository is corrupt in a way that appears rather common among 2 | our users. It contains a tag and a branch that refer to revision 3 | 1.1.2.1, but revision 1.1.2.1 does not exist. 4 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/root-empty-directory/README.txt: -------------------------------------------------------------------------------- 1 | This directory does not contain any RCS files, so if the 2 | --include-empty-directories option is used it should be created in the 3 | commit that initializes the repository. 4 | -------------------------------------------------------------------------------- /test-data/missing-deltatext-cvsrepos/README: -------------------------------------------------------------------------------- 1 | Please note that revision 1.1.4.4 of the RCS file has a "delta" but no 2 | "deltatext". cvs2svn should test for this problem and emit a suitable 3 | error. 4 | 5 | This test file was submitted by Sebastian Marek. 6 | -------------------------------------------------------------------------------- /test-data/symlinks-cvsrepos/proj/README.txt: -------------------------------------------------------------------------------- 1 | This directory is used by the symlinks() test. The test creates a 2 | symlink in this directory before starting cvs2svn. 3 | 4 | This README file itself is ignored by cvs2svn because it doesn't end 5 | in ",v". 6 | -------------------------------------------------------------------------------- /test-data/symlinks-cvsrepos/proj/dir1/README.txt: -------------------------------------------------------------------------------- 1 | This directory is used by the symlinks() test. The test creates a 2 | symlink in this directory before starting cvs2svn. 3 | 4 | This README file itself is ignored by cvs2svn because it doesn't end 5 | in ",v". 6 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/symbol-mess-path-hints.txt: -------------------------------------------------------------------------------- 1 | . .trunk. trunk /a/strange/trunk/path . 2 | . MOSTLY_BRANCH branch /special/branch/path . 3 | . MOSTLY_TAG tag /special/tag/path . 4 | . BRANCH_WITH_COMMIT . /special/other/branch/path . 5 | -------------------------------------------------------------------------------- /test-data/pass5-when-to-fill-cvsrepos/README: -------------------------------------------------------------------------------- 1 | This test checks a case where pass5 generates a fill which isn't actually 2 | needed, causing cvs2svn to die when it composes an empty revision in pass8. 3 | 4 | The bug was originally detected converting the apache 1.3 cvs repository. 5 | -------------------------------------------------------------------------------- /cvs2svn_lib/Makefile: -------------------------------------------------------------------------------- 1 | # This is a convenience Makefile, allowing "make" to be invoked in the 2 | # cvs2svn_lib directory. It simply re-invokes make in the main 3 | # project directory. 4 | 5 | .PHONY: all 6 | all:: 7 | $(MAKE) -C .. 8 | 9 | %: 10 | $(MAKE) -C .. $@ 11 | 12 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/cvs2git.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- mode: python; coding: utf-8 -*- mode.) 2 | 3 | # An options file to test converting to git. 4 | 5 | # Actually, the example file cvs2git-example.options is fully 6 | # functional, so we just load it: 7 | execfile('cvs2git-example.options') 8 | 9 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/cvs2hg.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- mode: python; coding: utf-8 -*- mode.) 2 | 3 | # An options file to test converting to Mercurial. 4 | 5 | # Actually, the example file cvs2hg-example.options is fully 6 | # functional, so we just load it: 7 | execfile('cvs2hg-example.options') 8 | 9 | -------------------------------------------------------------------------------- /test-data/symlinks-cvsrepos/proj/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.04.08.08.10.10; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @@ 21 | text 22 | @@ 23 | -------------------------------------------------------------------------------- /test-data/invalid-symbol-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | SYMBOL:1; 5 | locks; strict; 6 | comment @ * @; 7 | 8 | 9 | 1.1 10 | date 95.11.09.02.31.53; author author2; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @log 43@ 22 | text 23 | @@ 24 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror2-cvsrepos/proj/dir2/file3.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @// @; 6 | 7 | 8 | 1.1 9 | date 2001.02.16.00.44.44; author author1; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @log 1@ 21 | text 22 | @@ 23 | -------------------------------------------------------------------------------- /test-data/file-directory-conflict-cvsrepos/proj/name,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.03.26.13.00.00; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @Adding file "name". 21 | @ 22 | text 23 | @@ 24 | -------------------------------------------------------------------------------- /test-data/enroot-race-obo-cvsrepos/file,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.01.01.12.00.00; author jrandom; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @Initial revision 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/delete-cvsignore-cvsrepos/proj/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2006.10.15.13.12.43; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @Add random file and .cvsignore 21 | @ 22 | text 23 | @@ 24 | -------------------------------------------------------------------------------- /test-data/double-branch-delete-cvsrepos/SoftSet.java,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | Branch_4_0:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2006.05.11.02.23.22; author starksm; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @log1 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/file-directory-conflict-cvsrepos/proj/name/name2,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.03.26.12.00.00; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @Adding file "name2". 21 | @ 22 | text 23 | @@ 24 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror2-cvsrepos/proj/dir2/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH1:1.1.0.2; 5 | locks; strict; 6 | comment @// @; 7 | 8 | 9 | 1.1 10 | date 2002.01.04.21.27.35; author author1; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @log 2@ 22 | text 23 | @@ 24 | -------------------------------------------------------------------------------- /test-data/missing-vendor-branch-cvsrepos/file,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2006.09.06.19.14.41; author author3; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @Initial revision 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/requires-cvs-cvsrepos/atsign-add,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2000.01.01.01.01.01; author someuser; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @Somelogmsg 21 | @ 22 | text 23 | @Sometext 24 | /* $Id: */@ 25 | -------------------------------------------------------------------------------- /test-data/tagging-after-delete-cvsrepos/test/a,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | tag1:1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2006.11.28.18.18.23; author mark; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @added files 22 | @ 23 | text 24 | @file a 25 | @ 26 | -------------------------------------------------------------------------------- /test-data/add-cvsignore-to-branch-cvsrepos/dir/.cvsignore,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.09.30.09.26.41; author author11; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @@ 22 | text 23 | @*.o@ 24 | 25 | -------------------------------------------------------------------------------- /test-data/attic-directory-conflict-cvsrepos/proj/file1/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.04.08.08.10.10; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @*** empty log message *** 21 | @ 22 | text 23 | @@ 24 | -------------------------------------------------------------------------------- /test-data/file-in-attic-too-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2004.07.12.20.01.23; author fitz; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @initial import 21 | @ 22 | text 23 | @This is a file. So there. 24 | 25 | @ 26 | -------------------------------------------------------------------------------- /test-data/no-revs-file-cvsrepos/proj/one-rev.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.11.18.22.28.09; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | commitid cLpur0bMXRgJK6Gs; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @Add empty file 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/file-in-attic-too-cvsrepos/Attic/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2004.07.12.20.01.23; author fitz; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @initial import 21 | @ 22 | text 23 | @This is a file. So there. 24 | 25 | @ 26 | -------------------------------------------------------------------------------- /test-data/unicode-log-cvsrepos/testunicode,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.02.13.21.13.21; author kylo; state Exp; 10 | branches ; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 19 | 1.1 20 | log 21 | @This is a test message with unicode: å 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/eol-variants-cvsrepos/proj/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.10.17.21.00.40; author mhagger; state Exp; 10 | branches; 11 | next ; 12 | commitid nkHx4xZOOGvuiZBs; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @Adding file 22 | @ 23 | text 24 | @line 1 25 | line 2 26 | @ 27 | -------------------------------------------------------------------------------- /test-data/invalid-closings-on-trunk-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | TAG-ALL-FILES:1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.02.19.15.43.13; author fitz; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @Committing files a.txt and b.txt on trunk. 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/invalid-closings-on-trunk-cvsrepos/proj/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | TAG-ALL-FILES:1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.02.19.15.43.13; author fitz; state Exp; 11 | branches; 12 | next ; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @Committing files a.txt and b.txt on trunk. 22 | @ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/branch-from-deleted-1-1-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH1:1.1.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2007.06.25.22.20.14; author mhagger; state Exp; 12 | branches; 13 | next ; 14 | 15 | 16 | desc 17 | @@ 18 | 19 | 20 | 1.1 21 | log 22 | @Adding a.txt:1.1 23 | @ 24 | text 25 | @1.1 26 | @ 27 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | TAG:1.1 5 | BRANCH:1.1.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2010.01.16.06.17.56; author mhagger; state Exp; 12 | branches; 13 | next ; 14 | commitid 1nYTVRk8r2OuZxju; 15 | 16 | 17 | desc 18 | @@ 19 | 20 | 21 | 1.1 22 | log 23 | @Add a.txt. 24 | @ 25 | text 26 | @a 27 | @ 28 | -------------------------------------------------------------------------------- /test-data/many-deletes-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH:1.1.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2009.09.04.09.44.53; author mhagger; state Exp; 12 | branches; 13 | next ; 14 | commitid FASyv2HRCxOxrl2u; 15 | 16 | 17 | desc 18 | @@ 19 | 20 | 21 | 1.1 22 | log 23 | @Add a.txt 24 | @ 25 | text 26 | @@ 27 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror3-cvsrepos/proj/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | tree-serialize-branch:1.1.0.2 5 | tree-serialize-branchpoint:1.1; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2000.07.22.08.08.22; author author1; state Exp; 12 | branches; 13 | next ; 14 | 15 | 16 | desc 17 | @@ 18 | 19 | 20 | 1.1 21 | log 22 | @log 1@ 23 | text 24 | @@ 25 | -------------------------------------------------------------------------------- /test-data/cvsignore-cvsrepos/proj/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2004.07.19.20.57.24; author jrandom; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @Add a file. 21 | @ 22 | text 23 | @This is the only revision in this file. 24 | 25 | It's made of meat. 26 | @ 27 | -------------------------------------------------------------------------------- /test-data/add-on-branch-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH3:1.1.0.6 5 | BRANCH2:1.1.0.4 6 | BRANCH1:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2007.07.05.18.27.21; author mhagger; state Exp; 13 | branches; 14 | next ; 15 | 16 | 17 | desc 18 | @@ 19 | 20 | 21 | 1.1 22 | log 23 | @Adding a.txt:1.1 24 | @ 25 | text 26 | @1.1 27 | @ 28 | -------------------------------------------------------------------------------- /test-data/move-parent-cvsrepos/file2,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | b3:1.1.0.6 5 | b1:1.1.0.4 6 | b2:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2011.01.03.14.26.48; author pilegand; state Exp; 13 | branches; 14 | next ; 15 | commitid 657b4d21dca84567; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.1 23 | log 24 | @first 25 | @ 26 | text 27 | @file2 28 | @ 29 | -------------------------------------------------------------------------------- /MANIFEST.in: -------------------------------------------------------------------------------- 1 | include *.py dist.sh MANIFEST.in Makefile 2 | include README BUGS COMMITTERS COPYING HACKING CHANGES 3 | include cvs2svn-example.options 4 | include cvs2git-example.options 5 | include cvs2bzr-example.options 6 | include cvs2hg-example.options 7 | recursive-include svntest * 8 | recursive-include test-data * 9 | recursive-include doc * 10 | recursive-include contrib *.py *.pl cvs2svn_memlog 11 | -------------------------------------------------------------------------------- /test-data/branch-delete-first-cvsrepos/README.txt: -------------------------------------------------------------------------------- 1 | This repository exhibits has interesting characteristic that the very 2 | first thing that happen on a branch is that its sole file is deleted. 3 | A bug in cvs2svn caused this to delay branch creation until the end of 4 | the program (where we're finished off branches and tags), which 5 | resulted in the file's deletion from the branch never really 6 | happening. 7 | -------------------------------------------------------------------------------- /test-data/vendor-branch-sameness-cvsrepos/proj/d.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2004.02.12.22.01.44; author kfogel; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @Initial revision 21 | @ 22 | text 23 | @Added d.txt via 'cvs add', but with same timestamp as the imports. 24 | @ 25 | -------------------------------------------------------------------------------- /test-data/internal-co-keywords-cvsrepos/dir/kk.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @k@; 7 | 8 | 9 | 1.1 10 | date 2007.09.13.14.34.25; author ossi; state Exp; 11 | branches; 12 | next ; 13 | commitid e7E4xRVK9dgJfAxs; 14 | 15 | 16 | desc 17 | @@ 18 | 19 | 20 | 1.1 21 | log 22 | @add 23 | @ 24 | text 25 | @some text $Id: literal blunder$ more text 26 | @ 27 | -------------------------------------------------------------------------------- /test-data/internal-co-keywords-cvsrepos/dir/ko.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @o@; 7 | 8 | 9 | 1.1 10 | date 2007.09.13.14.34.25; author ossi; state Exp; 11 | branches; 12 | next ; 13 | commitid e7E4xRVK9dgJfAxs; 14 | 15 | 16 | desc 17 | @@ 18 | 19 | 20 | 1.1 21 | log 22 | @add 23 | @ 24 | text 25 | @some text $Id: literal blunder$ more text 26 | @ 27 | -------------------------------------------------------------------------------- /test-data/repeatedly-defined-symbols-cvsrepos/proj/default,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH:1.1.0.2 5 | BRANCH:1.1.0.2 6 | TAG:1.1 7 | TAG:1.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2003.05.22.23.20.19; author jrandom; state Exp; 14 | branches; 15 | next ; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.1 23 | log 24 | @Initial revision 25 | @ 26 | text 27 | @@ 28 | -------------------------------------------------------------------------------- /test-data/branch-from-vendor-branch-cvsrepos/branch-from-vendor-branch-symbol-hints.txt: -------------------------------------------------------------------------------- 1 | # Columns: 2 | #project_id symbol_name conversion symbol_path preferred_parent_name 3 | 0 .trunk. trunk trunk . 4 | 0 my-branch branch branches/my-branch .trunk. 5 | 0 vendor-tag exclude . . 6 | 0 vendor-branch exclude . . 7 | 8 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/README: -------------------------------------------------------------------------------- 1 | This repository is for testing that setting of svn:eol-style works as 2 | expected, that the mime mapper also works, and that mime types and eol 3 | styles interact with each other correctly. Issue #39 has more about 4 | how these interactions work. 5 | 6 | The 'mime-mappings.txt' file for this repository is stored right here, 7 | in the repository itself. It won't be converted because it doesn't 8 | end with ,v. 9 | -------------------------------------------------------------------------------- /test-data/internal-co-keywords-cvsrepos/dir/kv.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2007.09.13.14.34.25; author ossi; state Exp; 10 | branches; 11 | next ; 12 | commitid e7E4xRVK9dgJfAxs; 13 | 14 | 15 | desc 16 | @@ 17 | 18 | 19 | 1.1 20 | log 21 | @add 22 | @ 23 | text 24 | @$Author$ 25 | $Date$ 26 | $RCSfile$ 27 | $Source$ 28 | $State$ 29 | $Revision$ 30 | $Id$ 31 | $Header$ 32 | @ 33 | -------------------------------------------------------------------------------- /test-data/many-deletes-cvsrepos/proj/Attic/f.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH:1.1.0.2 6 | TAG:1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2009.09.04.09.45.32; author mhagger; state dead; 13 | branches; 14 | next ; 15 | commitid Jeo5F7Vn6nyLrl2u; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.1 23 | log 24 | @file e.txt was initially added on branch BRANCH. 25 | @ 26 | text 27 | @@ 28 | 29 | 30 | -------------------------------------------------------------------------------- /test-data/phoenix-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2000.09.01.09.56.05; author fitz; state Exp; 10 | branches; 11 | next ; 12 | 13 | 14 | desc 15 | @@ 16 | 17 | 18 | 1.1 19 | log 20 | @initial import 21 | @ 22 | text 23 | @This is a file on trunk that has a few revisions. It's here only to 24 | make sure that it doesn't accidentally get copied over to any branches 25 | when they get created. 26 | @ 27 | -------------------------------------------------------------------------------- /test-data/resync-pass2-pull-forward-cvsrepos/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | 6 | 7 | 1.2 8 | date 90.04.19.15.10.30; author user1; state Exp; 9 | branches; 10 | next 1.1; 11 | 12 | 1.1 13 | date 90.04.19.15.10.29; author user1; state Exp; 14 | branches; 15 | next ; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.2 23 | log 24 | @Summary: foo 25 | 26 | @ 27 | text 28 | @@ 29 | 30 | 31 | 1.1 32 | log 33 | @Initial revision 34 | @ 35 | text 36 | @@ 37 | -------------------------------------------------------------------------------- /test-data/resync-pass2-pull-forward-cvsrepos/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | 6 | 7 | 1.2 8 | date 90.04.19.15.10.41; author user1; state Exp; 9 | branches; 10 | next 1.1; 11 | 12 | 1.1 13 | date 90.04.19.15.10.41; author user1; state Exp; 14 | branches; 15 | next ; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.2 23 | log 24 | @Summary: foo 25 | 26 | @ 27 | text 28 | @@ 29 | 30 | 31 | 1.1 32 | log 33 | @Initial revision 34 | @ 35 | text 36 | @@ 37 | -------------------------------------------------------------------------------- /test-data/resync-pass2-push-backward-cvsrepos/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | 6 | 7 | 1.2 8 | date 90.04.19.15.10.30; author user1; state Exp; 9 | branches; 10 | next 1.1; 11 | 12 | 1.1 13 | date 90.04.19.15.10.29; author user1; state Exp; 14 | branches; 15 | next ; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.2 23 | log 24 | @Summary: foo 25 | 26 | @ 27 | text 28 | @@ 29 | 30 | 31 | 1.1 32 | log 33 | @Initial revision 34 | @ 35 | text 36 | @@ 37 | -------------------------------------------------------------------------------- /test-data/resync-pass2-push-backward-cvsrepos/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | 6 | 7 | 1.2 8 | date 90.04.19.15.10.21; author user1; state Exp; 9 | branches; 10 | next 1.1; 11 | 12 | 1.1 13 | date 90.04.19.15.10.21; author user1; state Exp; 14 | branches; 15 | next ; 16 | 17 | 18 | desc 19 | @@ 20 | 21 | 22 | 1.2 23 | log 24 | @Initial revision 25 | @ 26 | text 27 | @@ 28 | 29 | 30 | 1.1 31 | log 32 | @Summary: foo 33 | 34 | @ 35 | text 36 | @@ 37 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror-cvsrepos/powerpc/bits/Attic/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @ * @; 6 | 7 | 8 | 1.2 9 | date 2002.06.24.05.48.16; author author49; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2000.04.26.02.51.11; author author19; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @log 2492@ 26 | text 27 | @@ 28 | 29 | 30 | 1.1 31 | log 32 | @log 4326@ 33 | text 34 | @@ 35 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/cvs2svn.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # As a partial check that the example options file is functional, we 4 | # use it as the basis for this test. We only need to overwrite the 5 | # output option to get the output repository in the location expected 6 | # by the test infrastructure. 7 | 8 | execfile('cvs2svn-example.options') 9 | 10 | ctx.output_option = NewRepositoryOutputOption( 11 | 'cvs2svn-tmp/main--options=cvs2svn.options-svnrepos', 12 | ) 13 | 14 | -------------------------------------------------------------------------------- /test-data/resync-bug-cvsrepos/a,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.03.19.35.06; author max; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.03.19.33.42; author max; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Modify a. 26 | Add b. 27 | @ 28 | text 29 | @modify 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a. 36 | @ 37 | text 38 | @d1 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/tagging-after-delete-cvsrepos/test/Attic/b,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.11.28.18.18.39; author mark; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.11.28.18.18.24; author mark; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @removed file b 26 | @ 27 | text 28 | @file b 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @added files 35 | @ 36 | text 37 | @@ 38 | 39 | -------------------------------------------------------------------------------- /test-data/add-cvsignore-to-branch-cvsrepos/dir/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.01.28.12.14.36; author author8; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.05.03.15.31.02; author author1; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @@ 28 | text 29 | @@ 30 | 31 | 32 | 1.1.2.1 33 | log 34 | @@ 35 | text 36 | @@ 37 | 38 | 39 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/AB-loop/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.10.30.22.11.10; author mhagger; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.10.30.22.11.09; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @AB-loop-B 26 | @ 27 | text 28 | @1.2 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @AB-loop-A 35 | @ 36 | text 37 | @d1 1 38 | a1 1 39 | 1.1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/AB-loop/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.10.30.22.11.12; author mhagger; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.10.30.22.11.11; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @AB-loop-A 26 | @ 27 | text 28 | @1.2 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @AB-loop-B 35 | @ 36 | text 37 | @d1 1 38 | a1 1 39 | 1.1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABC-loop/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.10.30.22.11.14; author mhagger; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.10.30.22.11.13; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @ABC-loop-B 26 | @ 27 | text 28 | @1.2 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @ABC-loop-A 35 | @ 36 | text 37 | @d1 1 38 | a1 1 39 | 1.1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABC-loop/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.10.30.22.11.16; author mhagger; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.10.30.22.11.15; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @ABC-loop-C 26 | @ 27 | text 28 | @1.2 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @ABC-loop-B 35 | @ 36 | text 37 | @d1 1 38 | a1 1 39 | 1.1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABC-loop/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.10.30.22.11.18; author mhagger; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.10.30.22.11.17; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @ABC-loop-A 26 | @ 27 | text 28 | @1.2 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @ABC-loop-C 35 | @ 36 | text 37 | @d1 1 38 | a1 1 39 | 1.1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/pass5-when-to-fill-cvsrepos/root/c,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | mybranch:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.06.05.13.31.17; author max; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.06.05.13.31.18; author max; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @Add c to trunk 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @Branch commit of c 36 | @ 37 | text 38 | @@ 39 | 40 | -------------------------------------------------------------------------------- /test-data/attic-directory-conflict-cvsrepos/proj/Attic/file1,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2007.04.08.10.09.19; author mhagger; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2007.04.08.08.09.02; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @*** empty log message *** 26 | @ 27 | text 28 | @@ 29 | 30 | 31 | 1.1 32 | log 33 | @*** empty log message *** 34 | @ 35 | text 36 | @@ 37 | 38 | -------------------------------------------------------------------------------- /test-data/delete-cvsignore-cvsrepos/proj/Attic/.cvsignore,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2006.10.15.13.13.20; author mhagger; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2006.10.15.13.12.43; author mhagger; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Remove .cvsignore 26 | @ 27 | text 28 | @*.o 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @Add random file and .cvsignore 35 | @ 36 | text 37 | @@ 38 | 39 | -------------------------------------------------------------------------------- /test-data/commit-dependencies-cvsrepos/interleaved/file2,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2005.11.27.10.43.45; author ossi; state tst; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2005.11.27.10.42.18; author ossi; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @big commit 26 | @ 27 | text 28 | @file2 rev2 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @adding 35 | @ 36 | text 37 | @d1 1 38 | a1 1 39 | file2 rev1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/auto-props: -------------------------------------------------------------------------------- 1 | # auto-props file for auto_props() test. 2 | 3 | [auto-props] 4 | 5 | *.txt = myprop=txt 6 | *.xml = myprop=xml;svn:mime-type=text/xml;svn:eol-style=CRLF 7 | *.zip = myprop=zip;svn:mime-type=application/zip 8 | *.asc = myprop=asc;svn:mime-type=text/plain;!svn:eol-style 9 | 10 | *.bin = myprop=bin;svn:executable 11 | *.csv = myprop=csv;svn:mime-type=text/csv;svn:eol-style=CRLF 12 | *.dbf = myprop=dbf;svn:mime-type=application/what-is-dbf 13 | 14 | *.UPCASE1 = myprop=UPCASE1 15 | *.upcase2 = myprop=UPCASE2 16 | 17 | -------------------------------------------------------------------------------- /test-data/pass5-when-to-fill-cvsrepos/root/a,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | mybranch:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.06.05.13.30.31; author max; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.06.05.13.31.07; author max; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @Add a and b to trunk 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @Branch commit of a 36 | @ 37 | text 38 | @@ 39 | 40 | -------------------------------------------------------------------------------- /test-data/pass5-when-to-fill-cvsrepos/root/b,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | mybranch:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.06.05.13.30.31; author max; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.06.05.13.31.12; author max; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @Add a and b to trunk 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @Branch commit of b 36 | @ 37 | text 38 | @@ 39 | 40 | -------------------------------------------------------------------------------- /test-data/issue-106-cvsrepos/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.15; 3 | access; 4 | symbols 5 | branch:1.1.15; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2002.12.13.08.30.00; author joeschmo; state Exp; 12 | branches 13 | 1.1.15.1; 14 | next ; 15 | 16 | 1.1.15.1 17 | date 2002.12.13.08.30.00; author joeschmo; state Exp; 18 | branches; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @Initial revision 29 | @ 30 | text 31 | @@ 32 | 33 | 34 | 1.1.15.1 35 | log 36 | @a.txt 1.1.15.1 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror2-cvsrepos/proj/dir1/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | TAG1:1.1.2.1 5 | BRANCH1:1.1.2.1.0.2 6 | BRANCH2:1.1.0.2; 7 | locks; strict; 8 | comment @ * @; 9 | 10 | 11 | 1.1 12 | date 2002.06.24.05.47.35; author author2; state Exp; 13 | branches 14 | 1.1.2.1; 15 | next ; 16 | 17 | 1.1.2.1 18 | date 2002.07.03.17.27.18; author author3; state Exp; 19 | branches; 20 | next ; 21 | 22 | 23 | desc 24 | @@ 25 | 26 | 27 | 1.1 28 | log 29 | @log 3@ 30 | text 31 | @@ 32 | 33 | 34 | 1.1.2.1 35 | log 36 | @log 4@ 37 | text 38 | @@ 39 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror3-cvsrepos/proj/subdir/file3.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | tree-serialize-branch:1.1.0.2 5 | NET:1.1.1; 6 | locks; strict; 7 | comment @ * @; 8 | 9 | 10 | 1.1 11 | date 99.05.04.19.30.27; author author2; state Exp; 12 | branches 13 | 1.1.1.1; 14 | next ; 15 | 16 | 1.1.1.1 17 | date 99.05.04.19.30.27; author author2; state Exp; 18 | branches; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @Initial revision 29 | @ 30 | text 31 | @@ 32 | 33 | 34 | 1.1.1.1 35 | log 36 | @log 5@ 37 | text 38 | @@ 39 | -------------------------------------------------------------------------------- /test-data/add-on-branch2-cvsrepos/file1,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2005.12.05.22.35.31; author gward; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2005.12.05.22.35.31; author gward; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @file file1 was added on branch BRANCH 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @add file on branch 36 | @ 37 | text 38 | @@ 39 | 40 | 41 | -------------------------------------------------------------------------------- /test-data/issue-106-cvsrepos/d/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.15; 3 | access; 4 | symbols 5 | branch:1.1.15; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2002.12.13.08.29.37; author joeschmo; state Exp; 12 | branches 13 | 1.1.15.1; 14 | next ; 15 | 16 | 1.1.15.1 17 | date 2002.12.13.08.29.37; author joeschmo; state Exp; 18 | branches; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @Initial revision 29 | @ 30 | text 31 | @@ 32 | 33 | 34 | 1.1.15.1 35 | log 36 | @b.txt 1.1.15.1 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | -------------------------------------------------------------------------------- /test-data/issue-99-cvsrepos/file1,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | David:1.1.1; 6 | locks; strict; 7 | comment @# @; 8 | expand @o@; 9 | 10 | 11 | 1.1 12 | date 2003.07.08.20.57.54; author proski; state Exp; 13 | branches 14 | 1.1.1.1; 15 | next ; 16 | 17 | 1.1.1.1 18 | date 2003.07.08.20.57.54; author proski; state Exp; 19 | branches; 20 | next ; 21 | 22 | 23 | desc 24 | @@ 25 | 26 | 27 | 1.1 28 | log 29 | @Initial revision 30 | @ 31 | text 32 | @@ 33 | 34 | 35 | 1.1.1.1 36 | log 37 | @Version 0.13e 38 | @ 39 | text 40 | @@ 41 | 42 | 43 | -------------------------------------------------------------------------------- /test-data/split-branch-cvsrepos/README: -------------------------------------------------------------------------------- 1 | This tree is for reproducing 2 | 3 | http://subversion.tigris.org/issues/show_bug.cgi?id=1421 4 | 5 | It is based on issue-1421-small-cvsrepos.tgz from Blair Zajac. Previously, this 6 | directory contained a different set of test data, which began to pass after a 7 | partial fix in r6534. However, similar errors still occurred with other data 8 | sets. The issue was reopened, and the test data changed to more reliably test 9 | the bug. It continued to fail until the final fix in r7006. 10 | 11 | See the issue for more details. 12 | -------------------------------------------------------------------------------- /test-data/split-branch-cvsrepos/module/branched-from-trunk,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | demo-node-0:1.1.0.2; 5 | locks; strict; 6 | comment @;; @; 7 | 8 | 9 | 1.1 10 | date 98.02.19.21.28.43; author russel; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 98.02.25.18.56.53; author adam; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @This revision will go wrong 36 | @ 37 | text 38 | @@ 39 | 40 | -------------------------------------------------------------------------------- /test-data/branch-from-empty-dir-cvsrepos/proj/subdir/Attic/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH2:1.2.0.4 5 | BRANCH1:1.2.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.2 11 | date 2007.04.30.15.20.32; author mhagger; state dead; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2007.04.30.15.20.31; author mhagger; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.2 26 | log 27 | @Removing subdir/b.txt 28 | @ 29 | text 30 | @1.1 31 | @ 32 | 33 | 34 | 1.1 35 | log 36 | @Adding subdir/b.txt:1.1 37 | @ 38 | text 39 | @@ 40 | 41 | -------------------------------------------------------------------------------- /test-data/empty-trunk-cvsrepos/root/Attic/a_file,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | mytag:1.1.2.1 5 | mybranch:1.1.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2004.06.05.14.14.45; author max; state dead; 12 | branches 13 | 1.1.2.1; 14 | next ; 15 | 16 | 1.1.2.1 17 | date 2004.06.05.14.14.45; author max; state Exp; 18 | branches; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @file a_file was initially added on branch mybranch. 29 | @ 30 | text 31 | @@ 32 | 33 | 34 | 1.1.2.1 35 | log 36 | @Add a_file 37 | @ 38 | text 39 | @@ 40 | 41 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror3-cvsrepos/proj/subdir/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | tree-serialize-branch:1.1.0.2 5 | tree-serialize-branchpoint:1.1 6 | NET:1.1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 99.05.04.19.30.26; author author2; state Exp; 13 | branches 14 | 1.1.1.1; 15 | next ; 16 | 17 | 1.1.1.1 18 | date 99.05.04.19.30.26; author author2; state Exp; 19 | branches; 20 | next ; 21 | 22 | 23 | desc 24 | @@ 25 | 26 | 27 | 1.1 28 | log 29 | @Initial revision 30 | @ 31 | text 32 | @@ 33 | 34 | 35 | 1.1.1.1 36 | log 37 | @log 5@ 38 | text 39 | @@ 40 | -------------------------------------------------------------------------------- /test-data/double-add-cvsrepos/seemingly-irrelevant-file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | boom-branch:1.2.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.05.04.15.08.53; author harry; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2005.05.02.19.09.31; author sally; state dead; 16 | branches; 17 | next ; 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @merged some-branch to trunk 26 | @ 27 | text 28 | @@ 29 | 30 | 31 | 1.1 32 | log 33 | @file seemingly-irrelevant-file.txt was initially added on branch BRANCH-sally. 34 | @ 35 | text 36 | @@ 37 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/dir/file2,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BLOCKED_BY_UNNAMED:1.1.0.16 5 | BLOCKING_COMMIT:1.1.0.14 6 | BLOCKED_BY_COMMIT:1.1.0.12 7 | BLOCKING_BRANCH:1.1.0.10 8 | BLOCKED_BY_BRANCH:1.1.0.8 9 | MOSTLY_BRANCH:1.1.0.6 10 | MOSTLY_TAG:1.1 11 | BRANCH_WITH_COMMIT:1.1.0.4 12 | BRANCH:1.1.0.2 13 | TAG:1.1; 14 | locks; strict; 15 | comment @# @; 16 | 17 | 18 | 1.1 19 | date 2006.06.24.23.20.28; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.1 29 | log 30 | @Adding files on trunk 31 | @ 32 | text 33 | @line1 34 | @ 35 | -------------------------------------------------------------------------------- /test-data/symbol-mess-cvsrepos/dir/file3,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BLOCKED_BY_UNNAMED:1.1.0.16 5 | BLOCKING_COMMIT:1.1.0.14 6 | BLOCKED_BY_COMMIT:1.1.0.12 7 | BLOCKING_BRANCH:1.1.0.10 8 | BLOCKED_BY_BRANCH:1.1.0.8 9 | MOSTLY_BRANCH:1.1 10 | MOSTLY_TAG:1.1.0.6 11 | BRANCH_WITH_COMMIT:1.1.0.4 12 | BRANCH:1.1.0.2 13 | TAG:1.1; 14 | locks; strict; 15 | comment @# @; 16 | 17 | 18 | 1.1 19 | date 2006.06.24.23.20.28; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.1 29 | log 30 | @Adding files on trunk 31 | @ 32 | text 33 | @line1 34 | @ 35 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.bin,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @b@; 7 | 8 | 9 | 1.2 10 | date 2004.07.26.23.38.17; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision of every file. 27 | @ 28 | text 29 | @#!/bin/sh 30 | echo 'Hello world!' 31 | echo 'Hello back at you!' 32 | @ 33 | 34 | 35 | 1.1 36 | log 37 | @Add a file. 38 | @ 39 | text 40 | @d3 1 41 | @ 42 | 43 | -------------------------------------------------------------------------------- /test-data/non-ascii-cvsrepos/single-files/twoquick,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @ * @; 6 | 7 | 8 | 1.2 9 | date 2002.09.29.00.00.01; author jrandom; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2002.09.29.00.00.00; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Modify .cvsignore 26 | @ 27 | text 28 | @hello 29 | modified after checked in 30 | 31 | 32 | @ 33 | 34 | 35 | 1.1 36 | log 37 | @Add .cvsignore content with some latin1 characters. 38 | @ 39 | text 40 | @d2 2 41 | @ 42 | 43 | -------------------------------------------------------------------------------- /test-data/double-fill-cvsrepos/Attic/oldfile.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH-boom:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2005.04.04.16.13.48; author sally; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2005.04.04.16.13.48; author boom; state dead; 17 | branches; 18 | next ; 19 | 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @log message 29 | @ 30 | text 31 | @@ 32 | 33 | 34 | 1.1.2.1 35 | log 36 | @file oldfile.txt was added on branch BRANCH-boom on 2005-04-06 20:15:29 +0000 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.asc,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.xml,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.zip,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/cvsignore-cvsrepos/proj/.cvsignore,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.22.16.03.32; author fitz; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.22.16.02.36; author fitz; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Add a few more ignore lines, plus a blank line. 26 | @ 27 | text 28 | @*.idx 29 | *.aux 30 | *.dvi 31 | *.log 32 | foo 33 | bar 34 | baz 35 | qux 36 | 37 | @ 38 | 39 | 40 | 1.1 41 | log 42 | @initial import 43 | @ 44 | text 45 | @d5 5 46 | @ 47 | 48 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.UPCASE1,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.UPCASE2,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | 41 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/twoquick,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | after:1.2; 5 | locks 6 | maxb:1.2; strict; 7 | comment @ * @; 8 | 9 | 10 | 1.2 11 | date 2002.09.29.00.00.01; author jrandom; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2002.09.29.00.00.00; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.2 26 | log 27 | @*** empty log message *** 28 | @ 29 | text 30 | @hello 31 | modified after checked in 32 | 33 | 34 | @ 35 | 36 | 37 | 1.1 38 | log 39 | @*** empty log message *** 40 | @ 41 | text 42 | @d2 2 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/resync-bug-cvsrepos/b,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2003.07.03.19.35.55; author max; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.03.19.35.06; author max; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Modify b. 26 | This is the commit with the bad timestamp. 27 | (Suppose the server's clock was temporarily set for too early.) 28 | @ 29 | text 30 | @modify 31 | @ 32 | 33 | 34 | 1.1 35 | log 36 | @Modify a. 37 | Add b. 38 | @ 39 | text 40 | @d1 1 41 | @ 42 | 43 | -------------------------------------------------------------------------------- /test-data/branch-from-empty-dir-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.2.1.0.2 5 | BRANCH1:1.1.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2007.04.30.15.20.32; author mhagger; state Exp; 12 | branches 13 | 1.1.2.1; 14 | next ; 15 | 16 | 1.1.2.1 17 | date 2007.04.30.15.20.33; author mhagger; state Exp; 18 | branches; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @Adding a.txt:1.1 29 | @ 30 | text 31 | @1.1 32 | @ 33 | 34 | 35 | 1.1.2.1 36 | log 37 | @Committing a.txt:1.1.2.1 38 | @ 39 | text 40 | @d1 1 41 | a1 1 42 | 1.1.2.1 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/cvsignore-cvsrepos/proj/subdir/.cvsignore,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.22.16.03.32; author fitz; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.22.16.02.36; author fitz; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Add a few more ignore lines, plus a blank line. 26 | @ 27 | text 28 | @*.idx 29 | *.aux 30 | *.dvi 31 | *.log 32 | foo 33 | bar 34 | baz 35 | qux 36 | 37 | @ 38 | 39 | 40 | 1.1 41 | log 42 | @initial import 43 | @ 44 | text 45 | @d5 5 46 | @ 47 | 48 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/"double-double-quotes",v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | after:1.2; 5 | locks 6 | maxb:1.2; strict; 7 | comment @ * @; 8 | 9 | 10 | 1.2 11 | date 2002.09.29.00.00.01; author jrandom; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2002.09.29.00.00.00; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.2 26 | log 27 | @*** empty log message *** 28 | @ 29 | text 30 | @hello 31 | modified after checked in 32 | 33 | 34 | @ 35 | 36 | 37 | 1.1 38 | log 39 | @*** empty log message *** 40 | @ 41 | text 42 | @d2 2 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/can't-avoid-quotes,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | after:1.2; 5 | locks 6 | maxb:1.2; strict; 7 | comment @ * @; 8 | 9 | 10 | 1.2 11 | date 2002.09.29.00.00.01; author jrandom; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2002.09.29.00.00.00; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.2 26 | log 27 | @*** empty log message *** 28 | @ 29 | text 30 | @hello 31 | modified after checked in 32 | 33 | 34 | @ 35 | 36 | 37 | 1.1 38 | log 39 | @*** empty log message *** 40 | @ 41 | text 42 | @d2 2 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/quotin'-in-dirname/foo,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | after:1.2; 5 | locks 6 | maxb:1.2; strict; 7 | comment @ * @; 8 | 9 | 10 | 1.2 11 | date 2002.09.29.00.00.01; author jrandom; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2002.09.29.00.00.00; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.2 26 | log 27 | @*** empty log message *** 28 | @ 29 | text 30 | @hello 31 | modified after checked in 32 | 33 | 34 | @ 35 | 36 | 37 | 1.1 38 | log 39 | @*** empty log message *** 40 | @ 41 | text 42 | @d2 2 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/single-double-quote",v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | after:1.2; 5 | locks 6 | maxb:1.2; strict; 7 | comment @ * @; 8 | 9 | 10 | 1.2 11 | date 2002.09.29.00.00.01; author jrandom; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2002.09.29.00.00.00; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.2 26 | log 27 | @*** empty log message *** 28 | @ 29 | text 30 | @hello 31 | modified after checked in 32 | 33 | 34 | @ 35 | 36 | 37 | 1.1 38 | log 39 | @*** empty log message *** 40 | @ 41 | text 42 | @d2 2 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /contrib/__init__.py: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | # 3 | # ==================================================================== 4 | # Copyright (c) 2007 CollabNet. All rights reserved. 5 | # 6 | # This software is licensed as described in the file COPYING, which 7 | # you should have received as part of this distribution. 8 | # 9 | # This software consists of voluntary contributions made by many 10 | # individuals. For exact contribution history, see the revision 11 | # history and logs. 12 | # ==================================================================== 13 | 14 | """Allow this directory to be imported as a module.""" 15 | 16 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.csv,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @b@; 7 | 8 | 9 | 1.2 10 | date 2004.07.26.23.38.17; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision of every file. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | This line was added in the second revision. 31 | @ 32 | 33 | 34 | 1.1 35 | log 36 | @Add a file. 37 | @ 38 | text 39 | @d2 1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /test-data/eol-mime-cvsrepos/foo.dbf,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @b@; 7 | 8 | 9 | 1.2 10 | date 2004.07.26.23.38.17; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision of every file. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | This line was added in the second revision. 31 | @ 32 | 33 | 34 | 1.1 35 | log 36 | @Add a file. 37 | @ 38 | text 39 | @d2 1 40 | @ 41 | 42 | -------------------------------------------------------------------------------- /cvs2svn_lib/__init__.py: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | # 3 | # ==================================================================== 4 | # Copyright (c) 2000-2008 CollabNet. All rights reserved. 5 | # 6 | # This software is licensed as described in the file COPYING, which 7 | # you should have received as part of this distribution. 8 | # 9 | # This software consists of voluntary contributions made by many 10 | # individuals. For exact contribution history, see the revision 11 | # history and logs. 12 | # ==================================================================== 13 | 14 | """This package contains modules that support cvs2svn.""" 15 | 16 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/attr-exec,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks ; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2003.01.25.13.43.57; author jrandom; state Exp; 11 | branches 1.1.1.1; 12 | next ; 13 | 14 | 1.1.1.1 15 | date 2003.01.25.13.43.57; author jrandom; state Exp; 16 | branches ; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @#!/bin/sh 31 | echo Hello world! 32 | @ 33 | 34 | 35 | 1.1.1.1 36 | log 37 | @initial checkin 38 | @ 39 | text 40 | @@ 41 | -------------------------------------------------------------------------------- /test-data/requires-cvs-cvsrepos/space-in-authorname,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.26.23.38.17; author William Lyon Phelps III; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author j random; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision of every file. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | This line was added in the second revision. 30 | @ 31 | 32 | 33 | 1.1 34 | log 35 | @Add a file. 36 | @ 37 | text 38 | @d2 1 39 | @ 40 | -------------------------------------------------------------------------------- /test-data/log-message-eols-cvsrepos/lottalogs,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access ; 3 | symbols ; 4 | locks ; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2003.08.28.15.00.00; author jrandom; state Exp; 10 | branches ; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2003.07.28.15.00.00; author jrandom; state Exp; 15 | branches ; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @The CR at the end of this line should be turned into a LF. 26 | @ 27 | text 28 | @Nothing to see here. 29 | @ 30 | 31 | 32 | 1.1 33 | log 34 | @The CRLF at the end of this line 35 | should be turned into a LF. 36 | @ 37 | text 38 | @@ 39 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/single-files/space fname,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks ; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2002.11.30.19.27.42; author jrandom; state Exp; 11 | branches 1.1.1.1; 12 | next ; 13 | 14 | 1.1.1.1 15 | date 2002.11.30.19.27.42; author jrandom; state Exp; 16 | branches ; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @Just a test for spaces in the file name. 31 | @ 32 | 33 | 34 | 1.1.1.1 35 | log 36 | @imported 37 | @ 38 | text 39 | @@ 40 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror-cvsrepos/powerpc/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @ * @; 6 | 7 | 8 | 1.3 9 | date 2002.06.24.05.48.14; author author49; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2000.04.26.02.46.59; author author19; state dead; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2000.04.21.20.33.29; author author19; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @log 2492@ 31 | text 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @log 4326@ 38 | text 39 | @@ 40 | 41 | 42 | 1.1 43 | log 44 | @log 4129@ 45 | text 46 | @@ 47 | -------------------------------------------------------------------------------- /test-data/move-parent-cvsrepos/file1,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | b3:1.1.2.1.0.4 5 | b1:1.1.2.1.0.2 6 | b2:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2011.01.03.14.26.48; author pilegand; state Exp; 13 | branches 14 | 1.1.2.1; 15 | next ; 16 | commitid 657b4d21dca84567; 17 | 18 | 1.1.2.1 19 | date 2011.01.03.14.26.51; author pilegand; state Exp; 20 | branches; 21 | next ; 22 | commitid 657f4d21dcab4567; 23 | 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.1 30 | log 31 | @first 32 | @ 33 | text 34 | @file1 35 | @ 36 | 37 | 38 | 1.1.2.1 39 | log 40 | @second 41 | @ 42 | text 43 | @a1 1 44 | On b2 45 | @ 46 | 47 | -------------------------------------------------------------------------------- /test-data/vendor-branch-sameness-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols vtag-1:1.1.1.1 vbranchA:1.1.1; 5 | locks ; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.02.12.22.01.44; author kfogel; state Exp; 11 | branches 1.1.1.1; 12 | next ; 13 | 14 | 1.1.1.1 15 | date 2004.02.12.22.01.44; author kfogel; state Exp; 16 | branches ; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @Import vtag-1 on vbranchA. 31 | @ 32 | 33 | 34 | 1.1.1.1 35 | log 36 | @First vendor branch revision. 37 | @ 38 | text 39 | @@ 40 | -------------------------------------------------------------------------------- /test-data/symbolic-name-overfill-cvsrepos/proj/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | branch1:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.07.23.19.16.28; author fitz; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.07.23.19.17.22; author fitz; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @initial import 28 | @ 29 | text 30 | @This is a file. That's all there is to it.@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @Commit to file on branch. 36 | @ 37 | text 38 | @d1 1 39 | a1 1 40 | This is a file. It's now on a branch.@ 41 | 42 | -------------------------------------------------------------------------------- /test-data/vendor-branch-sameness-cvsrepos/proj/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols vtag-1:1.1.1.1 vbranchA:1.1.1; 5 | locks ; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.02.12.22.01.44; author kfogel; state Exp; 11 | branches 1.1.1.1; 12 | next ; 13 | 14 | 1.1.1.1 15 | date 2004.02.12.22.01.44; author kfogel; state dead; 16 | branches ; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @Import vtag-1 on vbranchA. 31 | @ 32 | 33 | 34 | 1.1.1.1 35 | log 36 | @First vendor branch revision. 37 | @ 38 | text 39 | @@ 40 | -------------------------------------------------------------------------------- /test-data/CVSROOT/README: -------------------------------------------------------------------------------- 1 | This CVSROOT/ directory is only here to convince CVS to treat the 2 | neighboring directories as CVS repository modules. Without it, CVS 3 | operations fail with an error like: 4 | 5 | cvs [checkout aborted]: .../main-cvsrepos/CVSROOT: No such file or directory 6 | 7 | Of course, CVS doesn't seem to require that there actually be any 8 | files in CVSROOT/, which kind of makes one wonder why it cares about 9 | the directory at all. 10 | 11 | Although this directly is only strictly needed when the --use-cvs 12 | option is used, cvs2svn checks that every project has an associated 13 | CVSROOT directory to avoid complicating its bookkeeping. 14 | -------------------------------------------------------------------------------- /test-data/symbolic-name-overfill-cvsrepos/proj/Attic/file-added-on-branch.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | branch1:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.07.23.19.28.17; author fitz; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.07.23.19.28.17; author fitz; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @file branched-file.txt was initially added on branch branch1. 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @initial import 36 | @ 37 | text 38 | @a0 2 39 | This file added on a branch. 40 | 41 | @ 42 | 43 | -------------------------------------------------------------------------------- /test-data/tag-with-no-revision-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | TAG:1.1.2.1 5 | SUBBRANCH:1.1.2.1.0.2; 6 | locks; strict; 7 | comment @// @; 8 | 9 | 10 | 1.3 11 | date 2004.03.19.19.47.32; author joeschmo; state dead; 12 | branches; 13 | next 1.2; 14 | 15 | 1.2 16 | date 98.06.22.21.46.37; author joeschmo; state Exp; 17 | branches; 18 | next 1.1; 19 | 20 | 1.1 21 | date 98.06.05.10.40.26; author joeschmo; state dead; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.3 31 | log 32 | @@ 33 | text 34 | @@ 35 | 36 | 37 | 1.2 38 | log 39 | @@ 40 | text 41 | @@ 42 | 43 | 44 | 1.1 45 | log 46 | @@ 47 | text 48 | @@ 49 | -------------------------------------------------------------------------------- /test-data/phoenix-cvsrepos/Attic/added-on-branch.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | xiphophorus:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.06.15.15.33.01; author fitz; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.06.15.15.33.01; author fitz; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @file added-on-branch.txt was initially added on branch xiphophorus. 28 | @ 29 | text 30 | @@ 31 | 32 | 33 | 1.1.2.1 34 | log 35 | @File added on branch xiphophorus 36 | @ 37 | text 38 | @a0 1 39 | This file was added on the branch xiphophorus.@ 40 | 41 | -------------------------------------------------------------------------------- /test-data/preferred-parent-cycle-cvsrepos/dir/file1,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | C:1.1.2.1.0.6 5 | B:1.1.2.1.0.4 6 | A:1.1.2.1.0.2 7 | X:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2007.04.22.16.35.58; author mhagger; state Exp; 14 | branches 15 | 1.1.2.1; 16 | next ; 17 | 18 | 1.1.2.1 19 | date 2007.04.22.16.35.59; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.1 29 | log 30 | @Adding files on trunk 31 | @ 32 | text 33 | @1.1 34 | @ 35 | 36 | 37 | 1.1.2.1 38 | log 39 | @Adding revision on first-level branches 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.1.2.1 45 | @ 46 | 47 | -------------------------------------------------------------------------------- /test-data/preferred-parent-cycle-cvsrepos/dir/file2,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | A:1.1.2.1.0.6 5 | C:1.1.2.1.0.4 6 | B:1.1.2.1.0.2 7 | Y:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2007.04.22.16.35.58; author mhagger; state Exp; 14 | branches 15 | 1.1.2.1; 16 | next ; 17 | 18 | 1.1.2.1 19 | date 2007.04.22.16.35.59; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.1 29 | log 30 | @Adding files on trunk 31 | @ 32 | text 33 | @1.1 34 | @ 35 | 36 | 37 | 1.1.2.1 38 | log 39 | @Adding revision on first-level branches 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.1.2.1 45 | @ 46 | 47 | -------------------------------------------------------------------------------- /test-data/preferred-parent-cycle-cvsrepos/dir/file3,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | B:1.1.2.1.0.6 5 | A:1.1.2.1.0.4 6 | C:1.1.2.1.0.2 7 | Z:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2007.04.22.16.35.58; author mhagger; state Exp; 14 | branches 15 | 1.1.2.1; 16 | next ; 17 | 18 | 1.1.2.1 19 | date 2007.04.22.16.35.59; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.1 29 | log 30 | @Adding files on trunk 31 | @ 32 | text 33 | @1.1 34 | @ 35 | 36 | 37 | 1.1.2.1 38 | log 39 | @Adding revision on first-level branches 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.1.2.1 45 | @ 46 | 47 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/full-prune-reappear/appears-later,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2003.06.10.20.19.48; author jrandom; state Exp; 11 | branches 12 | 1.1.1.1; 13 | next ; 14 | 15 | 1.1.1.1 16 | date 2003.06.10.20.19.48; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @This file is added to a directory that had earlier been pruned, to 31 | demonstrate that the directory reappears. 32 | @ 33 | 34 | 35 | 1.1.1.1 36 | log 37 | @Updated CVS 38 | @ 39 | text 40 | @@ 41 | -------------------------------------------------------------------------------- /test-data/many-deletes-cvsrepos/proj/Attic/d.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH:1.1.0.2 6 | TAG:1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2009.09.04.09.45.32; author mhagger; state dead; 13 | branches 14 | 1.1.4.2; 15 | next ; 16 | commitid Jeo5F7Vn6nyLrl2u; 17 | 18 | 1.1.4.2 19 | date 2009.09.04.09.46.18; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | commitid l4kyUGsxvoE1sl2u; 23 | 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.1 30 | log 31 | @file d.txt was initially added on branch BRANCH. 32 | @ 33 | text 34 | @@ 35 | 36 | 37 | 1.1.4.2 38 | log 39 | @Add files on BRANCH2. 40 | @ 41 | text 42 | @@ 43 | 44 | 45 | -------------------------------------------------------------------------------- /test-data/overlapping-branch-cvsrepos/nonoverlapping-branch,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols 5 | vendorA:1.1.1; 6 | locks ; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2002.11.30.19.27.42; author jrandom; state Exp; 12 | branches 1.1.1.1; 13 | next ; 14 | 15 | 1.1.1.1 16 | date 2002.11.30.19.27.42; author jrandom; state Exp; 17 | branches ; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 26 | 1.1 27 | log 28 | @Initial revision 29 | @ 30 | text 31 | @The content of this file is unimportant, what matters is that it 32 | has one branch. 33 | @ 34 | 35 | 36 | 1.1.1.1 37 | log 38 | @imported 39 | @ 40 | text 41 | @@ 42 | -------------------------------------------------------------------------------- /test-data/double-fill2-cvsrepos/proj/d.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH2:1.1.2.1.0.2 5 | BRANCH1:1.1.0.2; 6 | locks; strict; 7 | comment @// @; 8 | 9 | 10 | 1.2 11 | date 2005.08.17.02.27.39; author author1; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2005.02.25.18.17.06; author author8; state Exp; 17 | branches 18 | 1.1.2.1; 19 | next ; 20 | 21 | 1.1.2.1 22 | date 2005.02.25.23.10.11; author author8; state Exp; 23 | branches; 24 | next ; 25 | 26 | 27 | desc 28 | @@ 29 | 30 | 31 | 1.2 32 | log 33 | @log 1@ 34 | text 35 | @@ 36 | 37 | 38 | 1.1 39 | log 40 | @log 16@ 41 | text 42 | @@ 43 | 44 | 45 | 1.1.2.1 46 | log 47 | @log 16@ 48 | text 49 | @@ 50 | -------------------------------------------------------------------------------- /test-data/mirror-keyerror3-cvsrepos/proj/subdir/Attic/file4.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | NET:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 99.05.05.10.04.36; author author2; state dead; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 99.05.04.19.30.26; author author2; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 99.05.04.19.30.26; author author2; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @log 6@ 33 | text 34 | @@ 35 | 36 | 37 | 1.1 38 | log 39 | @Initial revision 40 | @ 41 | text 42 | @@ 43 | 44 | 45 | 1.1.1.1 46 | log 47 | @log 5@ 48 | text 49 | @@ 50 | -------------------------------------------------------------------------------- /test-data/revision-reorder-bug-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2003.09.11.13.57.15; author qwerty; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2003.09.11.13.57.15; author qwerty; state dead; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2003.09.09.15.47.53; author qwerty; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @x 31 | @ 32 | text 33 | @x 34 | x 35 | x 36 | x 37 | x 38 | @ 39 | 40 | 41 | 1.2 42 | log 43 | @x 44 | @ 45 | text 46 | @d1 1 47 | a1 1 48 | x 49 | @ 50 | 51 | 52 | 1.1 53 | log 54 | @x 55 | @ 56 | text 57 | @@ 58 | 59 | -------------------------------------------------------------------------------- /test-data/double-fill2-cvsrepos/proj/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.8 5 | BRANCH1:1.1.0.2; 6 | locks; strict; 7 | comment @// @; 8 | 9 | 10 | 1.1 11 | date 2005.10.03.17.35.55; author author8; state Exp; 12 | branches 13 | 1.1.2.1 14 | 1.1.8.1; 15 | next ; 16 | 17 | 1.1.2.1 18 | date 2005.10.04.10.54.11; author author8; state Exp; 19 | branches; 20 | next ; 21 | 22 | 1.1.8.1 23 | date 2005.10.05.20.46.30; author author6; state Exp; 24 | branches; 25 | next ; 26 | 27 | 28 | desc 29 | @@ 30 | 31 | 32 | 1.1 33 | log 34 | @log 17@ 35 | text 36 | @@ 37 | 38 | 39 | 1.1.8.1 40 | log 41 | @log 18@ 42 | text 43 | @@ 44 | 45 | 46 | 1.1.2.1 47 | log 48 | @log 19@ 49 | text 50 | @@ 51 | -------------------------------------------------------------------------------- /test-data/vendor-branch-sameness-cvsrepos/proj/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols vtag-1:1.1.1.1 vbranchA:1.1.1; 5 | locks ; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.02.12.22.01.44; author kfogel; state Exp; 11 | branches 1.1.1.1; 12 | next ; 13 | 14 | 1.1.1.1 15 | date 2004.02.12.22.01.44; author kfogel; state Exp; 16 | branches ; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @Import vtag-1 on vbranchA. 31 | @ 32 | 33 | 34 | 1.1.1.1 35 | log 36 | @First vendor branch revision. 37 | @ 38 | text 39 | @a1 1 40 | The text on the vendor branch is different. 41 | @ 42 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/partial-prune/permanent,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 94.06.18.05.46.08; author jrandom; state Exp; 11 | branches 12 | 1.1.1.1; 13 | next ; 14 | 15 | 1.1.1.1 16 | date 94.06.18.05.46.08; author jrandom; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @Initial revision 28 | @ 29 | text 30 | @This file was added in between the addition of sub/first and 31 | sub/second, to demonstrate that when those two are both removed, the 32 | pruning stops with sub/. 33 | @ 34 | 35 | 36 | 1.1.1.1 37 | log 38 | @Updated CVS 39 | @ 40 | text 41 | @@ 42 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/httpp/.cvsignore,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | libshout-2_0:1.2 5 | libshout-2_0b3:1.2 6 | libshout-2_0b2:1.2 7 | libshout_2_0b1:1.2 8 | libogg2-zerocopy:1.2.0.2; 9 | locks; strict; 10 | comment @# @; 11 | 12 | 13 | 1.2 14 | date 2001.09.10.03.04.10; author jack; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2001.09.10.03.00.40; author jack; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.2 29 | log 30 | @.cvsignore is fun! 31 | @ 32 | text 33 | @Makefile 34 | Makefile.in 35 | .deps 36 | .libs 37 | *.la 38 | *.lo 39 | @ 40 | 41 | 42 | 1.1 43 | log 44 | @Still more .cvsignore 45 | @ 46 | text 47 | @d4 3 48 | @ 49 | 50 | -------------------------------------------------------------------------------- /test-data/vendor-branch-sameness-cvsrepos/proj/e.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols vtag-2:1.1.1.1 vbranchB:1.1.1; 5 | locks ; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2005.02.12.22.01.44; author kfogel; state Exp; 11 | branches 1.1.1.1; 12 | next ; 13 | 14 | 1.1.1.1 15 | date 2005.02.12.22.01.44; author kfogel; state Exp; 16 | branches ; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 25 | 1.1 26 | log 27 | @This log message is not the standard 'Initial revision\n' that 28 | indicates an import. 29 | @ 30 | text 31 | @Import vtag-2 on vbranchB. 32 | @ 33 | 34 | 35 | 1.1.1.1 36 | log 37 | @First vendor branch revision. 38 | @ 39 | text 40 | @@ 41 | -------------------------------------------------------------------------------- /test-data/double-branch-delete-cvsrepos/Streams.java,v: -------------------------------------------------------------------------------- 1 | head 1.4; 2 | access; 3 | symbols 4 | Branch_4_0:1.4.0.18; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.4 10 | date 2002.05.31.03.09.03; author user57; state Exp; 11 | branches 12 | 1.4.18.1; 13 | next ; 14 | 15 | 1.4.18.1 16 | date 2005.10.29.05.07.47; author starksm; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.4 26 | log 27 | @ o turned commented System.out's into gaurded log.trace's 28 | o flush output buffer on copyb, as if it was not a buffer already the last 29 | bit might be (and usually is) lost. 30 | @ 31 | text 32 | @@ 33 | 34 | 35 | 1.4.18.1 36 | log 37 | @Update the LGPL header 38 | @ 39 | text 40 | @@ 41 | 42 | 43 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/httpp/TODO,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | libshout-2_0:1.1.1.1 6 | libshout-2_0b3:1.1.1.1 7 | libshout-2_0b2:1.1.1.1 8 | libshout_2_0b1:1.1.1.1 9 | libogg2-zerocopy:1.1.1.1.0.2 10 | start:1.1.1.1 11 | xiph:1.1.1; 12 | locks; strict; 13 | comment @# @; 14 | 15 | 16 | 1.1 17 | date 2001.09.10.02.28.47; author jack; state Exp; 18 | branches 19 | 1.1.1.1; 20 | next ; 21 | 22 | 1.1.1.1 23 | date 2001.09.10.02.28.47; author jack; state Exp; 24 | branches; 25 | next ; 26 | 27 | 28 | desc 29 | @@ 30 | 31 | 32 | 33 | 1.1 34 | log 35 | @Initial revision 36 | @ 37 | text 38 | @- nothing i can think of 39 | @ 40 | 41 | 42 | 1.1.1.1 43 | log 44 | @move to cvs 45 | @ 46 | text 47 | @@ 48 | -------------------------------------------------------------------------------- /test-data/default-branches-cvsrepos/proj/added-then-imported.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | vtag-4:1.1.1.1 5 | vbranchA:1.1.1; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2004.02.09.15.43.15; author kfogel; state Exp; 12 | branches 13 | 1.1.1.1; 14 | next ; 15 | 16 | 1.1.1.1 17 | date 2004.02.09.15.43.16; author kfogel; state Exp; 18 | branches; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 1.1 27 | log 28 | @Add a file to the working copy. 29 | @ 30 | text 31 | @Adding this file, before importing it with different contents. 32 | @ 33 | 34 | 35 | 1.1.1.1 36 | log 37 | @Import (vbranchA, vtag-4). 38 | @ 39 | text 40 | @d1 1 41 | a1 1 42 | This is vtag-4 (on vbranchA) of added-then-imported.txt. 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/many-deletes-cvsrepos/proj/Attic/e.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH:1.1.0.2 6 | TAG:1.1 7 | TAG2:1.1.4.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2009.09.04.09.45.32; author mhagger; state dead; 14 | branches 15 | 1.1.4.1; 16 | next ; 17 | commitid Jeo5F7Vn6nyLrl2u; 18 | 19 | 1.1.4.1 20 | date 2009.09.04.09.45.32; author mhagger; state dead; 21 | branches; 22 | next ; 23 | commitid l4kyUGsxvoE1sl2u; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.1 31 | log 32 | @file e.txt was initially added on branch BRANCH. 33 | @ 34 | text 35 | @@ 36 | 37 | 38 | 1.1.4.1 39 | log 40 | @file e.txt was added on branch BRANCH2 on 2009-09-04 09:46:18 +0000 41 | @ 42 | text 43 | @@ 44 | 45 | 46 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/thread/.cvsignore,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | libshout-2_0:1.2 5 | libshout-2_0b3:1.2 6 | libshout-2_0b2:1.2 7 | libshout_2_0b1:1.2 8 | libogg2-zerocopy:1.2.0.4 9 | branch-beta2-rewrite:1.2.0.2; 10 | locks; strict; 11 | comment @# @; 12 | 13 | 14 | 1.2 15 | date 2001.09.10.03.04.11; author jack; state Exp; 16 | branches; 17 | next 1.1; 18 | 19 | 1.1 20 | date 2001.09.10.03.00.41; author jack; state Exp; 21 | branches; 22 | next ; 23 | 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.2 30 | log 31 | @.cvsignore is fun! 32 | @ 33 | text 34 | @Makefile 35 | Makefile.in 36 | .deps 37 | .libs 38 | *.la 39 | *.lo 40 | @ 41 | 42 | 43 | 1.1 44 | log 45 | @Still more .cvsignore 46 | @ 47 | text 48 | @d4 3 49 | @ 50 | 51 | -------------------------------------------------------------------------------- /test-data/commit-dependencies-cvsrepos/interleaved/file1,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2005.11.27.10.43.34; author ossi; state tst; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2005.11.27.10.43.12; author ossi; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2005.11.27.10.42.18; author ossi; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @dependant small commit 31 | @ 32 | text 33 | @file1 rev3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @big commit 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | file1 rev2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @adding 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | file1 rev1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/double-fill-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH-boom:1.2.0.2; 5 | locks; strict; 6 | comment @ * @; 7 | 8 | 9 | 1.2 10 | date 2005.04.22.14.13.03; author harry; state Exp; 11 | branches 12 | 1.2.2.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2005.04.21.19.38.46; author sally; state dead; 17 | branches; 18 | next ; 19 | 20 | 1.2.2.1 21 | date 2005.04.22.14.13.03; author harry; state dead; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @log message 33 | @ 34 | text 35 | @@ 36 | 37 | 38 | 1.2.2.1 39 | log 40 | @file file.txt was added on branch BRANCH-boom on 2005-04-22 17:58:42 +0000 41 | @ 42 | text 43 | @@ 44 | 45 | 46 | 1.1 47 | log 48 | @log message 49 | @ 50 | text 51 | @@ 52 | -------------------------------------------------------------------------------- /test-data/bogus-tag-cvsrepos/bogus-tag,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols 5 | ends_with_slash/:1.1; 6 | locks ; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2002.11.30.19.27.42; author jrandom; state Exp; 12 | branches 1.1.1.1; 13 | next ; 14 | 15 | 1.1.1.1 16 | date 2002.11.30.19.27.42; author jrandom; state Exp; 17 | branches ; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 26 | 1.1 27 | log 28 | @The content of this revision is unimportant, what matters is that 29 | there's a tag named 'ends_with_slash/' on it, an illegal tag name 30 | that cvs2svn.py should detect early. 31 | @ 32 | text 33 | @Nothing to see here. 34 | @ 35 | 36 | 37 | 1.1.1.1 38 | log 39 | @imported 40 | @ 41 | text 42 | @@ 43 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.kb,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @b@; 7 | 8 | 9 | 1.2 10 | date 2004.07.28.10.42.27; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision, appending text to the first revision. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | 31 | It has three keywords: 32 | 33 | $Author$ 34 | 35 | $Date$ 36 | 37 | $Id$ 38 | This second revision appends some text to the first revision. 39 | @ 40 | 41 | 42 | 1.1 43 | log 44 | @Add a file. 45 | @ 46 | text 47 | @d10 1 48 | @ 49 | 50 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.kk,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @k@; 7 | 8 | 9 | 1.2 10 | date 2004.07.28.10.42.27; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision, appending text to the first revision. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | 31 | It has three keywords: 32 | 33 | $Author$ 34 | 35 | $Date$ 36 | 37 | $Id$ 38 | This second revision appends some text to the first revision. 39 | @ 40 | 41 | 42 | 1.1 43 | log 44 | @Add a file. 45 | @ 46 | text 47 | @d10 1 48 | @ 49 | 50 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.ko,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @o@; 7 | 8 | 9 | 1.2 10 | date 2004.07.28.10.42.27; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision, appending text to the first revision. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | 31 | It has three keywords: 32 | 33 | $Author$ 34 | 35 | $Date$ 36 | 37 | $Id$ 38 | This second revision appends some text to the first revision. 39 | @ 40 | 41 | 42 | 1.1 43 | log 44 | @Add a file. 45 | @ 46 | text 47 | @d10 1 48 | @ 49 | 50 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABC-passthru-loop/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.21; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.20; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.19; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABC-passthru-loop-C 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABC-passthru-loop-B 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABC-passthru-loop-A 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABC-passthru-loop/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.24; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.23; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.22; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABC-passthru-loop-A 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABC-passthru-loop-C 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABC-passthru-loop-B 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABC-passthru-loop/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.27; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.26; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.25; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABC-passthru-loop-B 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABC-passthru-loop-A 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABC-passthru-loop-C 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/timestamp-chaos-cvsrepos/proj/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2007.01.01.22.00.00; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2000.01.01.00.00.00; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2007.01.01.21.00.00; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @Revision 1.3 31 | @ 32 | text 33 | @Revision 1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @Revision 1.2 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | Revision 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @Revision 1.1 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | Revision 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/timestamp-chaos-cvsrepos/proj/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2007.01.01.22.00.00; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2030.01.01.00.00.00; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2007.01.01.21.00.00; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @Revision 1.3 31 | @ 32 | text 33 | @Revision 1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @Revision 1.2 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | Revision 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @Revision 1.1 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | Revision 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABCD-passthru-loop/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.30; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.29; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.28; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABCD-passthru-loop-C 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABCD-passthru-loop-B 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABCD-passthru-loop-A 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABCD-passthru-loop/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.33; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.32; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.31; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABCD-passthru-loop-D 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABCD-passthru-loop-C 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABCD-passthru-loop-B 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABCD-passthru-loop/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.36; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.35; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.34; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABCD-passthru-loop-A 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABCD-passthru-loop-D 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABCD-passthru-loop-C 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/ABCD-passthru-loop/d.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.3 9 | date 2006.10.30.22.11.39; author mhagger; state Exp; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 2006.10.30.22.11.38; author mhagger; state Exp; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 2006.10.30.22.11.37; author mhagger; state Exp; 20 | branches; 21 | next ; 22 | 23 | 24 | desc 25 | @@ 26 | 27 | 28 | 1.3 29 | log 30 | @ABCD-passthru-loop-B 31 | @ 32 | text 33 | @1.3 34 | @ 35 | 36 | 37 | 1.2 38 | log 39 | @ABCD-passthru-loop-A 40 | @ 41 | text 42 | @d1 1 43 | a1 1 44 | 1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @ABCD-passthru-loop-D 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | 1.1 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/ctrl-char-in-log-cvsrepos/ctrl-char-in-log,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols 5 | vendorbranch:1.1.1 6 | vendortag:1.1.1.1; 7 | locks ; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2003.07.28.15.00.00; author jrandom; state Exp; 13 | branches 1.1.1.1; 14 | next ; 15 | 16 | 1.1.1.1 17 | date 2003.07.28.15.00.00; author jrandom; state Exp; 18 | branches ; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 27 | 1.1 28 | log 29 | @The content of this revision is unimportant, what matters is that 30 | this log message contains a Ctrl-D right here, "", and cvs2svn.py 31 | should handle this. 32 | @ 33 | text 34 | @Nothing to see here. 35 | @ 36 | 37 | 38 | 1.1.1.1 39 | log 40 | @imported 41 | @ 42 | text 43 | @@ 44 | -------------------------------------------------------------------------------- /test-data/overlapping-branch-cvsrepos/overlapping-branch,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access ; 4 | symbols 5 | vendorA:1.1.1 6 | vendorB:1.1.1; 7 | locks ; strict; 8 | comment @# @; 9 | 10 | 11 | 1.1 12 | date 2002.11.30.19.27.42; author jrandom; state Exp; 13 | branches 1.1.1.1; 14 | next ; 15 | 16 | 1.1.1.1 17 | date 2002.11.30.19.27.42; author jrandom; state Exp; 18 | branches ; 19 | next ; 20 | 21 | 22 | desc 23 | @@ 24 | 25 | 26 | 27 | 1.1 28 | log 29 | @Initial revision 30 | @ 31 | text 32 | @The content of this file is unimportant, what matters is that the 33 | same branch has two different symbolic names, a condition which 34 | cvs2svn.py should warn about. 35 | @ 36 | 37 | 38 | 1.1.1.1 39 | log 40 | @imported 41 | @ 42 | text 43 | @@ 44 | -------------------------------------------------------------------------------- /cvs2svn_lib/metadata.py: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | # 3 | # ==================================================================== 4 | # Copyright (c) 2008 CollabNet. All rights reserved. 5 | # 6 | # This software is licensed as described in the file COPYING, which 7 | # you should have received as part of this distribution. 8 | # 9 | # This software consists of voluntary contributions made by many 10 | # individuals. For exact contribution history, see the revision 11 | # history and logs. 12 | # ==================================================================== 13 | 14 | """Represent CVSRevision metadata.""" 15 | 16 | 17 | class Metadata(object): 18 | def __init__(self, id, author, log_msg): 19 | self.id = id 20 | self.author = author 21 | self.log_msg = log_msg 22 | 23 | 24 | -------------------------------------------------------------------------------- /test-data/trunk-readd-cvsrepos/root/b_file,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | mytag:1.1.2.1 5 | mybranch:1.1.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.2 11 | date 2007.06.17.18.48.11; author mhagger; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2004.06.05.14.14.45; author max; state dead; 17 | branches 18 | 1.1.2.1; 19 | next ; 20 | 21 | 1.1.2.1 22 | date 2004.06.05.14.14.45; author max; state Exp; 23 | branches; 24 | next ; 25 | 26 | 27 | desc 28 | @@ 29 | 30 | 31 | 1.2 32 | log 33 | @Re-adding b_file on trunk 34 | @ 35 | text 36 | @b_file 1.2 37 | @ 38 | 39 | 40 | 1.1 41 | log 42 | @file b_file was initially added on branch mybranch. 43 | @ 44 | text 45 | @d1 1 46 | @ 47 | 48 | 49 | 1.1.2.1 50 | log 51 | @Add b_file 52 | @ 53 | text 54 | @@ 55 | 56 | -------------------------------------------------------------------------------- /test-data/vendor-1-1-non-root-cvsrepos/file001,v: -------------------------------------------------------------------------------- 1 | head 5.1; 2 | branch 5.1.0; 3 | access; 4 | symbols; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 5.1 10 | date 2014.01.08.18.04.10; author author1; state Exp; 11 | branches 12 | 5.1.0.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2002.08.23.16.30.15; author author2; state Exp; 17 | branches; 18 | next ; 19 | 20 | 5.1.0.1 21 | date 2014.01.08.18.04.10; author author1; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 5.1 31 | log 32 | @log 1@ 33 | text 34 | @This text was last seen in HEAD (revision 5.1) 35 | @ 36 | 37 | 38 | 5.1.0.1 39 | log 40 | @log 2@ 41 | text 42 | @@ 43 | 44 | 45 | 1.1 46 | log 47 | @Initial revision 48 | @ 49 | text 50 | @d1 1 51 | a1 1 52 | This text was last seen in revision 1.1 53 | @ 54 | -------------------------------------------------------------------------------- /test-data/split-branch-cvsrepos/module/branched-from-branch,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | demo-node-0:1.1.1.1.0.2 5 | first_working:1.1.1; 6 | locks; strict; 7 | comment @;; @; 8 | 9 | 10 | 1.1 11 | date 98.02.08.01.48.39; author russel; state Exp; 12 | branches 13 | 1.1.1.1; 14 | next ; 15 | 16 | 1.1.1.1 17 | date 98.02.08.01.48.39; author russel; state Exp; 18 | branches 19 | 1.1.1.1.2.1; 20 | next ; 21 | 22 | 1.1.1.1.2.1 23 | date 98.02.25.18.56.53; author adam; state dead; 24 | branches; 25 | next ; 26 | 27 | 28 | desc 29 | @@ 30 | 31 | 32 | 1.1 33 | log 34 | @Initial revision 35 | @ 36 | text 37 | @@ 38 | 39 | 40 | 1.1.1.1 41 | log 42 | @Create a branch 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1.1.1.2.1 49 | log 50 | @This revision will go wrong 51 | @ 52 | text 53 | @@ 54 | 55 | -------------------------------------------------------------------------------- /test-data/issue-99-cvsrepos/file2,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | orinoco_0_13d:1.1.1.2 6 | orinoco_0_13c:1.1.1.1 7 | David:1.1.1; 8 | locks; strict; 9 | comment @ * @; 10 | expand @o@; 11 | 12 | 13 | 1.1 14 | date 2003.07.08.20.56.26; author proski; state Exp; 15 | branches 16 | 1.1.1.1; 17 | next ; 18 | 19 | 1.1.1.1 20 | date 2003.07.08.20.56.26; author proski; state Exp; 21 | branches; 22 | next 1.1.1.2; 23 | 24 | 1.1.1.2 25 | date 2003.07.08.20.56.50; author proski; state Exp; 26 | branches; 27 | next ; 28 | 29 | 30 | desc 31 | @@ 32 | 33 | 34 | 1.1 35 | log 36 | @Initial revision 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | 1.1.1.1 43 | log 44 | @Version 0.13c 45 | @ 46 | text 47 | @@ 48 | 49 | 50 | 1.1.1.2 51 | log 52 | @Version 0.13d 53 | @ 54 | text 55 | @@ 56 | 57 | 58 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/httpp/BUILDING,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | libshout-2_0:1.1.1.1 6 | libshout-2_0b3:1.1.1.1 7 | libshout-2_0b2:1.1.1.1 8 | libshout_2_0b1:1.1.1.1 9 | libogg2-zerocopy:1.1.1.1.0.2 10 | start:1.1.1.1 11 | xiph:1.1.1; 12 | locks; strict; 13 | comment @# @; 14 | 15 | 16 | 1.1 17 | date 2001.09.10.02.28.49; author jack; state Exp; 18 | branches 19 | 1.1.1.1; 20 | next ; 21 | 22 | 1.1.1.1 23 | date 2001.09.10.02.28.49; author jack; state Exp; 24 | branches; 25 | next ; 26 | 27 | 28 | desc 29 | @@ 30 | 31 | 32 | 33 | 1.1 34 | log 35 | @Initial revision 36 | @ 37 | text 38 | @defines that affect compilation 39 | 40 | none 41 | 42 | library dependencies 43 | 44 | uses avl 45 | @ 46 | 47 | 48 | 1.1.1.1 49 | log 50 | @move to cvs 51 | @ 52 | text 53 | @@ 54 | -------------------------------------------------------------------------------- /cvs2svn_lib/version.py: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env python 2 | # (Be in -*- python -*- mode.) 3 | # 4 | # ==================================================================== 5 | # Copyright (c) 2007-2009 CollabNet. All rights reserved. 6 | # 7 | # This software is licensed as described in the file COPYING, which 8 | # you should have received as part of this distribution. 9 | # 10 | # This software consists of voluntary contributions made by many 11 | # individuals. For exact contribution history, see the revision 12 | # history and logs. 13 | # ==================================================================== 14 | 15 | # The version of cvs2svn: 16 | VERSION = '2.6.0-dev' 17 | 18 | 19 | # If this file is run as a script, print the cvs2svn version number to 20 | # stdout: 21 | if __name__ == '__main__': 22 | print VERSION 23 | 24 | 25 | -------------------------------------------------------------------------------- /test-data/commit-dependencies-cvsrepos/multi-branch/file1,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | branch:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.12.27.10.45.27; author ossi; state tst; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2005.12.27.10.44.37; author ossi; state Exp; 16 | branches 17 | 1.1.2.1; 18 | next ; 19 | 20 | 1.1.2.1 21 | date 2005.12.27.10.45.53; author ossi; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @multi-branch-commit 33 | @ 34 | text 35 | @file1 rev2 head 36 | @ 37 | 38 | 39 | 1.1 40 | log 41 | @adding 42 | @ 43 | text 44 | @d1 1 45 | a1 1 46 | file1 rev1 47 | @ 48 | 49 | 50 | 1.1.2.1 51 | log 52 | @multi-branch-commit 53 | @ 54 | text 55 | @d1 1 56 | a1 1 57 | file1 rev2 branch 58 | @ 59 | 60 | 61 | -------------------------------------------------------------------------------- /test-data/commit-dependencies-cvsrepos/multi-branch/file2,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | branch:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.12.27.10.46.17; author ossi; state tst; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2005.12.27.10.44.37; author ossi; state Exp; 16 | branches 17 | 1.1.2.1; 18 | next ; 19 | 20 | 1.1.2.1 21 | date 2005.12.27.10.46.41; author ossi; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @multi-branch-commit 33 | @ 34 | text 35 | @file2 rev2 head 36 | @ 37 | 38 | 39 | 1.1 40 | log 41 | @adding 42 | @ 43 | text 44 | @d1 1 45 | a1 1 46 | file2 rev1 47 | @ 48 | 49 | 50 | 1.1.2.1 51 | log 52 | @multi-branch-commit 53 | @ 54 | text 55 | @d1 1 56 | a1 1 57 | file2 rev2 branch 58 | @ 59 | 60 | 61 | -------------------------------------------------------------------------------- /test-data/unlabeled-branch-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2009.08.21.23.07.52; author mhagger; state Exp; 11 | branches 12 | 1.1.2.1 13 | 1.1.4.1; 14 | next ; 15 | 16 | 1.1.2.1 17 | date 2009.08.21.23.08.54; author mhagger; state Exp; 18 | branches; 19 | next ; 20 | 21 | 1.1.4.1 22 | date 2009.08.21.23.10.11; author mhagger; state Exp; 23 | branches; 24 | next ; 25 | 26 | 27 | desc 28 | @@ 29 | 30 | 31 | 1.1 32 | log 33 | @Initial commit. 34 | @ 35 | text 36 | @1.1 37 | @ 38 | 39 | 40 | 1.1.4.1 41 | log 42 | @Commit on unlabeled branch. 43 | @ 44 | text 45 | @d1 1 46 | a1 1 47 | 1.1.4.1 48 | @ 49 | 50 | 51 | 1.1.2.1 52 | log 53 | @Commit on BRANCH. 54 | @ 55 | text 56 | @d1 1 57 | a1 1 58 | 1.1.2.1 59 | @ 60 | 61 | -------------------------------------------------------------------------------- /cvs2svn_rcsparse/README.cvs2svn: -------------------------------------------------------------------------------- 1 | This directory provides the 'rcsparse' library that cvs2svn.py depends on. 2 | 3 | Although rcsparse ships with ViewVC, http://viewvc.tigris.org/, 4 | we don't want to just use the whatever rcsparse we find installed on 5 | the system -- such as one that's part of a local ViewVC installation. 6 | Instead, we want to use the exact version of rcsparse that is tested & 7 | known to work with this version of cvs2svn. 8 | 9 | Hence this directory. To upgrade to a newer rcsparse, we just run 10 | 'update', which fetches the current trunk versions using 'svn export'. 11 | 12 | We control when these upgrades happen, and install this library under 13 | the name 'cvs2svn_rcsparse', so it won't conflict with any 'rcsparse' 14 | already on the system; cvs2svn is careful to import it as 15 | 'cvs2svn_rcsparse'. 16 | -------------------------------------------------------------------------------- /test-data/internal-co-keywords-cvsrepos/dir/kv-deleted.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | branch; 3 | access; 4 | symbols 5 | b:1.1.1; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.2 11 | date 2004.07.28.10.42.27; author kfogel; state dead; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2004.07.19.20.57.24; author jrandom; state Exp; 17 | branches 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2004.07.19.20.57.25; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.2 30 | log 31 | @Deleting this dreadful file 32 | @ 33 | text 34 | @This is a fine file. 35 | 36 | This file resides at $Source$ 37 | @ 38 | 39 | 40 | 1.1 41 | log 42 | @Add a file. 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1.1.1 49 | log 50 | @Adding a line 51 | @ 52 | text 53 | @a1 1 54 | branches are fun 55 | @ 56 | -------------------------------------------------------------------------------- /test-data/add-on-branch-cvsrepos/proj/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH1:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2007.07.05.18.27.22; author mhagger; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2007.07.05.18.27.22; author mhagger; state dead; 17 | branches; 18 | next 1.1.2.2; 19 | 20 | 1.1.2.2 21 | date 2007.07.05.18.27.25; author mhagger; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.1 31 | log 32 | @Adding b.txt:1.1 33 | @ 34 | text 35 | @1.1 36 | @ 37 | 38 | 39 | 1.1.2.1 40 | log 41 | @file b.txt was added on branch BRANCH1 on 2007-07-05 18:27:25 +0000 42 | @ 43 | text 44 | @d1 1 45 | @ 46 | 47 | 48 | 1.1.2.2 49 | log 50 | @Adding b.txt:1.1.2.2 51 | @ 52 | text 53 | @a0 1 54 | 1.1.2.2 55 | @ 56 | 57 | 58 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/direct/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | TAG:1.3 5 | BRANCH:1.3.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.3 11 | date 2010.01.17.03.34.23; author mhagger; state Exp; 12 | branches; 13 | next 1.2; 14 | commitid 0WdTFEWnGdyo3Fju; 15 | 16 | 1.2 17 | date 2010.01.17.03.31.15; author mhagger; state dead; 18 | branches; 19 | next 1.1; 20 | commitid Ok3DlSXoWUFj2Fju; 21 | 22 | 1.1 23 | date 2010.01.16.06.19.51; author mhagger; state Exp; 24 | branches; 25 | next ; 26 | commitid T0xGHIyHXxz90yju; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 1.3 34 | log 35 | @Re-add b.txt. 36 | @ 37 | text 38 | @b2 39 | @ 40 | 41 | 42 | 1.2 43 | log 44 | @Remove b.txt. 45 | @ 46 | text 47 | @d1 1 48 | a1 1 49 | b 50 | @ 51 | 52 | 53 | 1.1 54 | log 55 | @Add b.txt. 56 | @ 57 | text 58 | @@ 59 | 60 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/httpp/README,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | libshout-2_0:1.1.1.1 6 | libshout-2_0b3:1.1.1.1 7 | libshout-2_0b2:1.1.1.1 8 | libshout_2_0b1:1.1.1.1 9 | libogg2-zerocopy:1.1.1.1.0.2 10 | start:1.1.1.1 11 | xiph:1.1.1; 12 | locks; strict; 13 | comment @# @; 14 | 15 | 16 | 1.1 17 | date 2001.09.10.02.28.47; author jack; state Exp; 18 | branches 19 | 1.1.1.1; 20 | next ; 21 | 22 | 1.1.1.1 23 | date 2001.09.10.02.28.47; author jack; state Exp; 24 | branches; 25 | next ; 26 | 27 | 28 | desc 29 | @@ 30 | 31 | 32 | 33 | 1.1 34 | log 35 | @Initial revision 36 | @ 37 | text 38 | @httpp is a simple http parser 39 | 40 | licensed under the lgpl 41 | 42 | created by jack moffitt 43 | @ 44 | 45 | 46 | 1.1.1.1 47 | log 48 | @move to cvs 49 | @ 50 | text 51 | @@ 52 | -------------------------------------------------------------------------------- /test-data/leftover-revs-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH:1.2.0.2; 5 | locks; strict; 6 | comment @// @; 7 | 8 | 9 | 1.2 10 | date 2003.07.04.16.36.26; author author4; state dead; 11 | branches 12 | 1.2.2.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2003.07.04.16.13.47; author author4; state Exp; 17 | branches; 18 | next ; 19 | 20 | 1.2.2.1 21 | date 2003.07.13.07.12.30; author author15; state Exp; 22 | branches; 23 | next 1.2.2.2; 24 | 25 | 1.2.2.2 26 | date 2004.04.09.01.57.02; author author15; state dead; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @log 1670@ 38 | text 39 | @@ 40 | 41 | 42 | 1.2.2.1 43 | log 44 | @log 1950@ 45 | text 46 | @@ 47 | 48 | 49 | 1.2.2.2 50 | log 51 | @log 11@ 52 | text 53 | @@ 54 | 55 | 56 | 1.1 57 | log 58 | @log 1671@ 59 | text 60 | @@ 61 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/indirect/subdirectory/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | TAG:1.3 5 | BRANCH:1.3.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.3 11 | date 2010.01.17.03.34.55; author mhagger; state Exp; 12 | branches; 13 | next 1.2; 14 | commitid 0ur5CblrKrQz3Fju; 15 | 16 | 1.2 17 | date 2010.01.17.03.31.45; author mhagger; state dead; 18 | branches; 19 | next 1.1; 20 | commitid 7o2iSAs9MgMu2Fju; 21 | 22 | 1.1 23 | date 2010.01.16.06.24.25; author mhagger; state Exp; 24 | branches; 25 | next ; 26 | commitid qH19tYzVmpCI1yju; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 1.3 34 | log 35 | @Re-add c.txt. 36 | @ 37 | text 38 | @c2 39 | @ 40 | 41 | 42 | 1.2 43 | log 44 | @Remove c.txt. 45 | @ 46 | text 47 | @d1 1 48 | a1 1 49 | c 50 | @ 51 | 52 | 53 | 1.1 54 | log 55 | @Add c.txt. 56 | @ 57 | text 58 | @@ 59 | 60 | -------------------------------------------------------------------------------- /test-data/invalid-symbol-cvsrepos/cvs2svn-ignore2.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # Fix a problem with an invalid symbol by ignoring it using an 4 | # IgnoreSymbolTransform. 5 | 6 | from cvs2svn_lib.symbol_transform import IgnoreSymbolTransform 7 | 8 | execfile('cvs2svn-example.options') 9 | 10 | name = 'invalid-symbol' 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/%s--options=cvs2svn-ignore2.options-svnrepos' % (name,), 14 | ) 15 | 16 | run_options.clear_projects() 17 | 18 | run_options.add_project( 19 | r'test-data/%s-cvsrepos' % (name,), 20 | trunk_path='trunk', 21 | branches_path='branches', 22 | tags_path='tags', 23 | symbol_transforms=[ 24 | IgnoreSymbolTransform(r'SYMBOL'), 25 | ], 26 | symbol_strategy_rules=global_symbol_strategy_rules, 27 | ) 28 | 29 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/1,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing numbers only. 33 | @ 34 | text 35 | @This is file 1, always committed with other numbers, never with letters. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/2,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing numbers only. 33 | @ 34 | text 35 | @This is file 2, always committed with other numbers, never with letters. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/3,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing numbers only. 33 | @ 34 | text 35 | @This is file 3, always committed with other numbers, never with letters. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/4,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing numbers only. 33 | @ 34 | text 35 | @This is file 4, always committed with other numbers, never with letters. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/5,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing numbers only. 33 | @ 34 | text 35 | @This is file 5, always committed with other numbers, never with letters. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/a,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing letters only. 33 | @ 34 | text 35 | @This is file a, always committed with other letters, never with numbers. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/b,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing letters only. 33 | @ 34 | text 35 | @This is file b, always committed with other letters, never with numbers. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/c,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing letters only. 33 | @ 34 | text 35 | @This is file c, always committed with other letters, never with numbers. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/d,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing letters only. 33 | @ 34 | text 35 | @This is file d, always committed with other letters, never with numbers. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/interleaved/e,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2003.06.03.00.20.01; author jrandom; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.05.24.01.02.01; author jrandom; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.05.24.01.02.01; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.2 31 | log 32 | @Committing letters only. 33 | @ 34 | text 35 | @This is file e, always committed with other letters, never with numbers. 36 | 37 | A random change on trunk. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @d2 2 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Initial import. 53 | @ 54 | text 55 | @@ 56 | -------------------------------------------------------------------------------- /test-data/double-fill2-cvsrepos/proj/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH1:1.1.0.2; 6 | locks; strict; 7 | comment @// @; 8 | 9 | 10 | 1.2 11 | date 2005.04.05.11.08.53; author author7; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2005.02.22.00.10.19; author author7; state Exp; 17 | branches 18 | 1.1.2.1 19 | 1.1.4.1; 20 | next ; 21 | 22 | 1.1.2.1 23 | date 2005.04.05.11.09.38; author author7; state Exp; 24 | branches; 25 | next ; 26 | 27 | 1.1.4.1 28 | date 2005.04.05.22.20.39; author author6; state Exp; 29 | branches; 30 | next ; 31 | 32 | 33 | desc 34 | @@ 35 | 36 | 37 | 1.2 38 | log 39 | @log 13@ 40 | text 41 | @@ 42 | 43 | 44 | 1.1 45 | log 46 | @log 14@ 47 | text 48 | @@ 49 | 50 | 51 | 1.1.4.1 52 | log 53 | @log 15@ 54 | text 55 | @@ 56 | 57 | 58 | 1.1.2.1 59 | log 60 | @log 13@ 61 | text 62 | @@ 63 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/full-prune/Attic/second,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 96.08.20.23.53.47; author jrandom; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 95.03.31.07.44.01; author jrandom; state Exp; 15 | branches 16 | 1.1.1.1; 17 | next ; 18 | 19 | 1.1.1.1 20 | date 95.03.31.07.44.02; author jrandom; state Exp; 21 | branches; 22 | next ; 23 | 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.2 30 | log 31 | @Remove the file 'second'. 32 | 33 | Since 'first' was already removed, removing 'second' empties the 34 | directory, so the directory itself gets pruned. 35 | @ 36 | text 37 | @@ 38 | 39 | 40 | 1.1 41 | log 42 | @Initial revision 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1.1.1 49 | log 50 | @Original sources from CVS-1.4A2 munged to fit our directory structure. 51 | 52 | @ 53 | text 54 | @@ 55 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/partial-prune/sub/Attic/second,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 96.08.20.23.53.47; author jrandom; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 95.03.31.07.44.01; author jrandom; state Exp; 15 | branches 16 | 1.1.1.1; 17 | next ; 18 | 19 | 1.1.1.1 20 | date 95.03.31.07.44.02; author jrandom; state Exp; 21 | branches; 22 | next ; 23 | 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.2 30 | log 31 | @Remove the file 'second'. 32 | 33 | Since 'first' was already removed, removing 'second' empties the 34 | directory, so the directory itself gets pruned. 35 | @ 36 | text 37 | @@ 38 | 39 | 40 | 1.1 41 | log 42 | @Initial revision 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1.1.1 49 | log 50 | @Original sources from CVS-1.4A2 munged to fit our directory structure. 51 | 52 | @ 53 | text 54 | @@ 55 | -------------------------------------------------------------------------------- /test-data/vendor-branch-delete-add-cvsrepos/proj/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendorbranch:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | expand @o@; 8 | 9 | 10 | 1.2 11 | date 2003.03.03.03.03.03; author cc; state Exp; 12 | branches; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2001.01.01.01.01.01; author aa; state Exp; 17 | branches 18 | 1.1.1.1; 19 | next ; 20 | 21 | 1.1.1.1 22 | date 2001.01.01.01.01.01; author aa; state Exp; 23 | branches; 24 | next 1.1.1.2; 25 | 26 | 1.1.1.2 27 | date 2002.02.02.02.02.02; author bb; state dead; 28 | branches; 29 | next ; 30 | 31 | 32 | desc 33 | @@ 34 | 35 | 36 | 1.2 37 | log 38 | @1.2 39 | @ 40 | text 41 | @@ 42 | 43 | 44 | 1.1 45 | log 46 | @Initial revision 47 | @ 48 | text 49 | @@ 50 | 51 | 52 | 1.1.1.1 53 | log 54 | @1.1.1.1 55 | @ 56 | text 57 | @@ 58 | 59 | 60 | 1.1.1.2 61 | log 62 | @1.1.1.2 63 | @ 64 | text 65 | @@ 66 | 67 | -------------------------------------------------------------------------------- /test-data/branch-from-deleted-1-1-cvsrepos/proj/Attic/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | TAG1:1.1 5 | BRANCH3:1.1.0.6 6 | BRANCH2:1.1.0.4 7 | BRANCH1:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2007.06.25.22.20.19; author mhagger; state dead; 14 | branches 15 | 1.1.2.1 16 | 1.1.4.1; 17 | next ; 18 | 19 | 1.1.2.1 20 | date 2007.06.25.22.20.19; author mhagger; state Exp; 21 | branches; 22 | next ; 23 | 24 | 1.1.4.1 25 | date 2007.06.25.22.20.21; author mhagger; state Exp; 26 | branches; 27 | next ; 28 | 29 | 30 | desc 31 | @@ 32 | 33 | 34 | 1.1 35 | log 36 | @file c.txt was initially added on branch BRANCH1. 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | 1.1.4.1 43 | log 44 | @Adding c.txt:1.1.4.1 45 | @ 46 | text 47 | @a0 1 48 | 1.1.4.1 49 | @ 50 | 51 | 52 | 1.1.2.1 53 | log 54 | @Adding c.txt:1.1.2.1 55 | @ 56 | text 57 | @a0 1 58 | 1.1.2.1 59 | @ 60 | 61 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/full-prune-reappear/sub/Attic/second,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 96.08.20.23.53.47; author jrandom; state dead; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 95.03.31.07.44.01; author jrandom; state Exp; 15 | branches 16 | 1.1.1.1; 17 | next ; 18 | 19 | 1.1.1.1 20 | date 95.03.31.07.44.02; author jrandom; state Exp; 21 | branches; 22 | next ; 23 | 24 | 25 | desc 26 | @@ 27 | 28 | 29 | 1.2 30 | log 31 | @Remove the file 'second'. 32 | 33 | Since 'first' was already removed, removing 'second' empties the 34 | directory, so the directory itself gets pruned. 35 | @ 36 | text 37 | @@ 38 | 39 | 40 | 1.1 41 | log 42 | @Initial revision 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1.1.1 49 | log 50 | @Original sources from CVS-1.4A2 munged to fit our directory structure. 51 | 52 | @ 53 | text 54 | @@ 55 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.kv,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @v@; 7 | 8 | 9 | 1.2 10 | date 2004.07.28.10.42.27; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision, appending text to the first revision. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | 31 | It has three keywords: 32 | 33 | jrandom 34 | 35 | 2004/07/19 20:57:24 36 | 37 | foo.kv,v 1.1 2004/07/19 20:57:24 jrandom Exp 38 | This second revision appends some text to the first revision. 39 | @ 40 | 41 | 42 | 1.1 43 | log 44 | @Add a file. 45 | @ 46 | text 47 | @d5 1 48 | a5 1 49 | $Author$ 50 | d7 1 51 | a7 1 52 | $Date$ 53 | d9 2 54 | a10 1 55 | $Id$ 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/multiply-defined-symbols-cvsrepos/proj/default,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH:1.2.0.4 5 | BRANCH:1.2.0.2 6 | TAG:1.2 7 | TAG:1.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.2 13 | date 2003.05.23.00.17.53; author jrandom; state Exp; 14 | branches 15 | 1.2.2.1 16 | 1.2.4.1; 17 | next 1.1; 18 | 19 | 1.1 20 | date 2003.05.22.23.20.19; author jrandom; state Exp; 21 | branches; 22 | next ; 23 | 24 | 1.2.2.1 25 | date 2003.05.23.00.31.36; author jrandom; state Exp; 26 | branches; 27 | next ; 28 | 29 | 1.2.4.1 30 | date 2003.06.03.03.20.31; author jrandom; state Exp; 31 | branches; 32 | next ; 33 | 34 | 35 | desc 36 | @@ 37 | 38 | 39 | 1.2 40 | log 41 | @@ 42 | text 43 | @@ 44 | 45 | 46 | 1.2.4.1 47 | log 48 | @@ 49 | text 50 | @@ 51 | 52 | 53 | 1.2.2.1 54 | log 55 | @@ 56 | text 57 | @@ 58 | 59 | 60 | 1.1 61 | log 62 | @Initial revision 63 | @ 64 | text 65 | @@ 66 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.kkv,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.28.10.42.27; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision, appending text to the first revision. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | 30 | It has three keywords: 31 | 32 | $Author: jrandom $ 33 | 34 | $Date: 2004/07/19 20:57:24 $ 35 | 36 | $Id: foo.kkv,v 1.1 2004/07/19 20:57:24 jrandom Exp $ 37 | This second revision appends some text to the first revision. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Add a file. 44 | @ 45 | text 46 | @d5 1 47 | a5 1 48 | $Author$ 49 | d7 1 50 | a7 1 51 | $Date$ 52 | d9 2 53 | a10 1 54 | $Id$ 55 | @ 56 | 57 | -------------------------------------------------------------------------------- /test-data/phoenix-cvsrepos/Attic/added-on-branch2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | xiphophorus:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2004.06.15.15.39.58; author fitz; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2004.06.15.15.39.58; author fitz; state Exp; 17 | branches; 18 | next ; 19 | 20 | 21 | desc 22 | @@ 23 | 24 | 25 | 1.1 26 | log 27 | @file added-on-branch2.txt was initially added on branch xiphophorus, 28 | and this log message was tweaked so that it's not the standard log 29 | message generated by CVS for the 'dead' trunk revision of a file added 30 | on a branch. 31 | @ 32 | text 33 | @@ 34 | 35 | 36 | 1.1.2.1 37 | log 38 | @This file was also added on branch xiphophorus, but slightly after the other file was added on this branch. 39 | @ 40 | text 41 | @a0 1 42 | This file was also added on the branch xiphophorus. 43 | @ 44 | 45 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.default,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.2 9 | date 2004.07.28.10.42.27; author kfogel; state Exp; 10 | branches; 11 | next 1.1; 12 | 13 | 1.1 14 | date 2004.07.19.20.57.24; author jrandom; state Exp; 15 | branches; 16 | next ; 17 | 18 | 19 | desc 20 | @@ 21 | 22 | 23 | 1.2 24 | log 25 | @Commit a second revision, appending text to the first revision. 26 | @ 27 | text 28 | @This is the first revision in this file. 29 | 30 | It has three keywords: 31 | 32 | $Author: jrandom $ 33 | 34 | $Date: 2004/07/19 20:57:24 $ 35 | 36 | $Id: foo.default,v 1.1 2004/07/19 20:57:24 jrandom Exp $ 37 | This second revision appends some text to the first revision. 38 | @ 39 | 40 | 41 | 1.1 42 | log 43 | @Add a file. 44 | @ 45 | text 46 | @d5 1 47 | a5 1 48 | $Author$ 49 | d7 1 50 | a7 1 51 | $Date$ 52 | d9 2 53 | a10 1 54 | $Id$ 55 | @ 56 | 57 | -------------------------------------------------------------------------------- /test-data/empty-directories-cvsrepos/import/d.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | VENDORTAG2:1.1.1.2 6 | VENDORTAG:1.1.1.1 7 | VENDORBRANCH:1.1.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2010.01.17.04.15.38; author mhagger; state Exp; 14 | branches 15 | 1.1.1.1; 16 | next ; 17 | commitid 3LFcsqdQSLZxhFju; 18 | 19 | 1.1.1.1 20 | date 2010.01.17.04.15.38; author mhagger; state Exp; 21 | branches; 22 | next 1.1.1.2; 23 | commitid 3LFcsqdQSLZxhFju; 24 | 25 | 1.1.1.2 26 | date 2010.01.17.04.24.25; author mhagger; state Exp; 27 | branches; 28 | next ; 29 | commitid ziMoRPJIXZOykFju; 30 | 31 | 32 | desc 33 | @@ 34 | 35 | 36 | 1.1 37 | log 38 | @Initial revision 39 | @ 40 | text 41 | @d 42 | @ 43 | 44 | 45 | 1.1.1.1 46 | log 47 | @Import d.txt. 48 | @ 49 | text 50 | @@ 51 | 52 | 53 | 1.1.1.2 54 | log 55 | @Re-import d.txt. 56 | @ 57 | text 58 | @d1 1 59 | a1 1 60 | d2 61 | @ 62 | 63 | -------------------------------------------------------------------------------- /test-data/keywords-cvsrepos/foo.kkvl,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | expand @kvl@; 7 | 8 | 9 | 1.2 10 | date 2004.07.28.10.42.27; author kfogel; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2004.07.19.20.57.24; author jrandom; state Exp; 16 | branches; 17 | next ; 18 | 19 | 20 | desc 21 | @@ 22 | 23 | 24 | 1.2 25 | log 26 | @Commit a second revision, appending text to the first revision. 27 | @ 28 | text 29 | @This is the first revision in this file. 30 | 31 | It has three keywords: 32 | 33 | $Author: jrandom $ 34 | 35 | $Date: 2004/07/19 20:57:24 $ 36 | 37 | $Id: foo.kkvl,v 1.1 2004/07/19 20:57:24 jrandom Exp $ 38 | This second revision appends some text to the first revision. 39 | @ 40 | 41 | 42 | 1.1 43 | log 44 | @Add a file. 45 | @ 46 | text 47 | @d5 1 48 | a5 1 49 | $Author$ 50 | d7 1 51 | a7 1 52 | $Date$ 53 | d9 2 54 | a10 1 55 | $Id$ 56 | @ 57 | 58 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/thread/TODO,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | libshout-2_0:1.1.1.1 6 | libshout-2_0b3:1.1.1.1 7 | libshout-2_0b2:1.1.1.1 8 | libshout_2_0b1:1.1.1.1 9 | libogg2-zerocopy:1.1.1.1.0.4 10 | branch-beta2-rewrite:1.1.1.1.0.2 11 | start:1.1.1.1 12 | xiph:1.1.1; 13 | locks; strict; 14 | comment @# @; 15 | 16 | 17 | 1.1 18 | date 2001.09.10.02.26.33; author jack; state Exp; 19 | branches 20 | 1.1.1.1; 21 | next ; 22 | 23 | 1.1.1.1 24 | date 2001.09.10.02.26.33; author jack; state Exp; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 34 | 1.1 35 | log 36 | @Initial revision 37 | @ 38 | text 39 | @- make DEBUG_MUTEXES and CHECK_MUTEXES work 40 | 41 | - recursive locking/unlocking (easy) 42 | - reader/writer locking (easy) 43 | - make a mode were _log is disabled (normal mode) (easy) 44 | @ 45 | 46 | 47 | 1.1.1.1 48 | log 49 | @move to cvs 50 | @ 51 | text 52 | @@ 53 | -------------------------------------------------------------------------------- /test-data/branch-from-vendor-branch-cvsrepos/data,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | my-branch:1.1.1.1.0.2 6 | vendor-tag:1.1.1.1 7 | vendor-branch:1.1.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2010.04.08.15.37.56; author fosterj; state Exp; 14 | branches 15 | 1.1.1.1; 16 | next ; 17 | commitid 2i5HeSdvL0B9s8uu; 18 | 19 | 1.1.1.1 20 | date 2010.04.08.15.37.56; author fosterj; state Exp; 21 | branches 22 | 1.1.1.1.2.1; 23 | next ; 24 | commitid 2i5HeSdvL0B9s8uu; 25 | 26 | 1.1.1.1.2.1 27 | date 2010.04.08.15.38.58; author fosterj; state Exp; 28 | branches; 29 | next ; 30 | commitid eDJ6tPpuBwVxs8uu; 31 | 32 | 33 | desc 34 | @@ 35 | 36 | 37 | 1.1 38 | log 39 | @Initial revision 40 | @ 41 | text 42 | @x 43 | @ 44 | 45 | 46 | 1.1.1.1 47 | log 48 | @Test import 49 | @ 50 | text 51 | @@ 52 | 53 | 54 | 1.1.1.1.2.1 55 | log 56 | @Branch commit 57 | @ 58 | text 59 | @d1 1 60 | a1 1 61 | y 62 | @ 63 | 64 | -------------------------------------------------------------------------------- /test-data/invalid-symbol-cvsrepos/cvs2svn-ignore.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # Fix a problem with an invalid symbol by ignoring it using a 4 | # SymbolMapper. 5 | 6 | from cvs2svn_lib.symbol_transform import SymbolMapper 7 | 8 | execfile('cvs2svn-example.options') 9 | 10 | name = 'invalid-symbol' 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/%s--options=cvs2svn-ignore.options-svnrepos' % (name,), 14 | ) 15 | 16 | run_options.clear_projects() 17 | 18 | filename = 'test-data/%s-cvsrepos/file.txt,v' % (name,) 19 | symbol_mapper = SymbolMapper([ 20 | (filename, 'SYMBOL', '1', None), 21 | ]) 22 | 23 | run_options.add_project( 24 | r'test-data/%s-cvsrepos' % (name,), 25 | trunk_path='trunk', 26 | branches_path='branches', 27 | tags_path='tags', 28 | symbol_transforms=[ 29 | symbol_mapper, 30 | ], 31 | symbol_strategy_rules=global_symbol_strategy_rules, 32 | ) 33 | 34 | -------------------------------------------------------------------------------- /dist.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | set -e 3 | 4 | # Build a cvs2svn distribution. 5 | 6 | VERSION=`python cvs2svn_lib/version.py` 7 | echo "Building cvs2svn ${VERSION}" 8 | WC_REV=`svnversion -n .` 9 | DIST_BASE=cvs2svn-${VERSION} 10 | DIST_FULL=${DIST_BASE}.tar.gz 11 | 12 | if echo ${WC_REV} | grep -q -e '[^0-9]'; then 13 | echo "Packaging requires a single-revision, pristine working copy." 14 | echo "" 15 | echo "Run 'svn update' to get a working copy without mixed revisions," 16 | echo "and make sure there are no local modifications." 17 | exit 1 18 | fi 19 | 20 | # Clean up anything that might have been left from a previous run. 21 | rm -rf dist MANIFEST ${DIST_FULL} 22 | make clean 23 | 24 | # Build the dist, Python's way. 25 | ./setup.py sdist 26 | mv dist/${DIST_FULL} . 27 | 28 | # Clean up after this run. 29 | rm -rf dist MANIFEST 30 | 31 | # We're outta here. 32 | echo "" 33 | echo "Done:" 34 | echo "" 35 | ls -l ${DIST_FULL} 36 | md5sum ${DIST_FULL} 37 | echo "" 38 | -------------------------------------------------------------------------------- /test-data/double-fill-cvsrepos/otherfile.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH-boom:1.2.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.03.29.22.31.23; author harry; state Exp; 11 | branches 12 | 1.2.2.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2005.03.29.13.21.35; author sally; state dead; 17 | branches; 18 | next ; 19 | 20 | 1.2.2.1 21 | date 2005.03.29.22.31.23; author harry; state dead; 22 | branches; 23 | next 1.2.2.2; 24 | 25 | 1.2.2.2 26 | date 2005.03.29.23.36.06; author harry; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @log message 38 | @ 39 | text 40 | @@ 41 | 42 | 43 | 1.2.2.1 44 | log 45 | @file otherfile.txt was added on branch BRANCH-boom on 2005-03-29 23:36:06 +0000 46 | @ 47 | text 48 | @@ 49 | 50 | 51 | 1.2.2.2 52 | log 53 | @merged trunk to boom 54 | @ 55 | text 56 | @@ 57 | 58 | 59 | 1.1 60 | log 61 | @log message 62 | @ 63 | text 64 | @@ 65 | 66 | 67 | 68 | -------------------------------------------------------------------------------- /test-data/many-deletes-cvsrepos/proj/Attic/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH:1.1.0.2 6 | TAG:1.1 7 | TAG2:1.1.4.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2009.09.04.09.45.32; author mhagger; state dead; 14 | branches 15 | 1.1.4.1; 16 | next ; 17 | commitid Jeo5F7Vn6nyLrl2u; 18 | 19 | 1.1.4.1 20 | date 2009.09.04.09.45.32; author mhagger; state dead; 21 | branches; 22 | next 1.1.4.2; 23 | commitid l4kyUGsxvoE1sl2u; 24 | 25 | 1.1.4.2 26 | date 2009.09.04.09.46.18; author mhagger; state Exp; 27 | branches; 28 | next ; 29 | commitid l4kyUGsxvoE1sl2u; 30 | 31 | 32 | desc 33 | @@ 34 | 35 | 36 | 1.1 37 | log 38 | @file c.txt was initially added on branch BRANCH. 39 | @ 40 | text 41 | @@ 42 | 43 | 44 | 1.1.4.1 45 | log 46 | @file c.txt was added on branch BRANCH2 on 2009-09-04 09:46:18 +0000 47 | @ 48 | text 49 | @@ 50 | 51 | 52 | 1.1.4.2 53 | log 54 | @Add files on BRANCH2. 55 | @ 56 | text 57 | @@ 58 | 59 | 60 | -------------------------------------------------------------------------------- /test-data/native-eol-cvsrepos/foo.txt,v: -------------------------------------------------------------------------------- 1 | head 1.4; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.4 9 | date 2005.01.04.19.59.01; author tori; state Exp; 10 | branches; 11 | next 1.3; 12 | 13 | 1.3 14 | date 2005.01.04.19.58.15; author tori; state Exp; 15 | branches; 16 | next 1.2; 17 | 18 | 1.2 19 | date 2005.01.04.19.57.04; author tori; state Exp; 20 | branches; 21 | next 1.1; 22 | 23 | 1.1 24 | date 2005.01.04.19.55.50; author tori; state Exp; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 1.4 34 | log 35 | @Mixed EOLs 36 | @ 37 | text 38 | @And then 39 | mixed EOLs 40 | @ 41 | 42 | 43 | 1.3 44 | log 45 | @CR EOLs 46 | @ 47 | text 48 | @d1 2 49 | a2 1 50 | And then CR EOLs @ 51 | 52 | 53 | 1.2 54 | log 55 | @CRLF EOLs 56 | @ 57 | text 58 | @d1 1 59 | a1 3 60 | Then 61 | CRLF 62 | EOLs 63 | @ 64 | 65 | 66 | 1.1 67 | log 68 | @LF EOLs 69 | @ 70 | text 71 | @d1 3 72 | a3 3 73 | First 74 | LF 75 | EOLs 76 | @ 77 | 78 | -------------------------------------------------------------------------------- /test-data/unlabeled-branch-cvsrepos/cvs2svn-ignore.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # Try ignoring an unlabeled branch using a SymbolMapper (it should 4 | # fail). 5 | 6 | from cvs2svn_lib.symbol_transform import SymbolMapper 7 | 8 | execfile('cvs2svn-example.options') 9 | 10 | name = 'unlabeled-branch' 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/%s--options=cvs2svn-ignore.options-svnrepos' % (name,), 14 | ) 15 | 16 | run_options.clear_projects() 17 | 18 | filename = 'test-data/%s-cvsrepos/proj/a.txt,v' % (name,) 19 | symbol_mapper = SymbolMapper([ 20 | (filename, 'unlabeled-1.1.4', '1.1.4', None), 21 | ]) 22 | 23 | run_options.add_project( 24 | r'test-data/%s-cvsrepos' % (name,), 25 | trunk_path='trunk', 26 | branches_path='branches', 27 | tags_path='tags', 28 | symbol_transforms=[ 29 | symbol_mapper, 30 | ], 31 | symbol_strategy_rules=global_symbol_strategy_rules, 32 | ) 33 | 34 | -------------------------------------------------------------------------------- /test-data/enroot-race-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | mybranch:1.3.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.3 10 | date 2004.02.04.17.02.08; author kfogel; state Exp; 11 | branches; 12 | next 1.2; 13 | 14 | 1.2 15 | date 2004.02.04.17.02.05; author kfogel; state Exp; 16 | branches; 17 | next 1.1; 18 | 19 | 1.1 20 | date 2004.02.04.17.02.04; author kfogel; state Exp; 21 | branches 22 | 1.1.1.1; 23 | next ; 24 | 25 | 1.1.1.1 26 | date 2004.02.04.17.02.04; author kfogel; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.3 36 | log 37 | @Commit next change. 38 | @ 39 | text 40 | @Next change. 41 | @ 42 | 43 | 44 | 1.2 45 | log 46 | @Commit first change. 47 | @ 48 | text 49 | @d1 1 50 | a1 1 51 | First change. 52 | @ 53 | 54 | 55 | 1.1 56 | log 57 | @Initial revision 58 | @ 59 | text 60 | @d1 1 61 | a1 1 62 | This is a.txt. 63 | @ 64 | 65 | 66 | 1.1.1.1 67 | log 68 | @Initial import. 69 | @ 70 | text 71 | @@ 72 | -------------------------------------------------------------------------------- /test-data/enroot-race-cvsrepos/proj/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | mybranch:1.3.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.3 10 | date 2004.02.04.17.02.08; author kfogel; state Exp; 11 | branches; 12 | next 1.2; 13 | 14 | 1.2 15 | date 2004.02.04.17.02.05; author kfogel; state Exp; 16 | branches; 17 | next 1.1; 18 | 19 | 1.1 20 | date 2004.02.04.17.02.04; author kfogel; state Exp; 21 | branches 22 | 1.1.1.1; 23 | next ; 24 | 25 | 1.1.1.1 26 | date 2004.02.04.17.02.04; author kfogel; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.3 36 | log 37 | @Commit next change. 38 | @ 39 | text 40 | @Next change. 41 | @ 42 | 43 | 44 | 1.2 45 | log 46 | @Commit first change. 47 | @ 48 | text 49 | @d1 1 50 | a1 1 51 | First change. 52 | @ 53 | 54 | 55 | 1.1 56 | log 57 | @Initial revision 58 | @ 59 | text 60 | @d1 1 61 | a1 1 62 | This is b.txt. 63 | @ 64 | 65 | 66 | 1.1.1.1 67 | log 68 | @Initial import. 69 | @ 70 | text 71 | @@ 72 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/full-prune/Attic/first,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @; @; 6 | 7 | 8 | 1.3 9 | date 95.12.30.18.37.22; author jrandom; state dead; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 95.12.11.00.27.53; author jrandom; state dead; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 93.06.18.05.46.07; author jrandom; state Exp; 20 | branches 21 | 1.1.1.1; 22 | next ; 23 | 24 | 1.1.1.1 25 | date 93.06.18.05.46.08; author jrandom; state Exp; 26 | branches; 27 | next ; 28 | 29 | 30 | desc 31 | @@ 32 | 33 | 34 | 1.3 35 | log 36 | @Remove the file 'first' again, which should have no effect. 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | 1.2 43 | log 44 | @Remove the file 'first', for the first time. 45 | 46 | (Note that its sibling 'second' still exists.) 47 | @ 48 | text 49 | @@ 50 | 51 | 52 | 1.1 53 | log 54 | @Initial revision 55 | @ 56 | text 57 | @@ 58 | 59 | 60 | 1.1.1.1 61 | log 62 | @Updated CVS 63 | @ 64 | text 65 | @@ 66 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/partial-prune/sub/Attic/first,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @; @; 6 | 7 | 8 | 1.3 9 | date 95.12.30.18.37.22; author jrandom; state dead; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 95.12.11.00.27.53; author jrandom; state dead; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 93.06.18.05.46.07; author jrandom; state Exp; 20 | branches 21 | 1.1.1.1; 22 | next ; 23 | 24 | 1.1.1.1 25 | date 93.06.18.05.46.08; author jrandom; state Exp; 26 | branches; 27 | next ; 28 | 29 | 30 | desc 31 | @@ 32 | 33 | 34 | 1.3 35 | log 36 | @Remove the file 'first' again, which should have no effect. 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | 1.2 43 | log 44 | @Remove the file 'first', for the first time. 45 | 46 | (Note that its sibling 'second' still exists.) 47 | @ 48 | text 49 | @@ 50 | 51 | 52 | 1.1 53 | log 54 | @Initial revision 55 | @ 56 | text 57 | @@ 58 | 59 | 60 | 1.1.1.1 61 | log 62 | @Updated CVS 63 | @ 64 | text 65 | @@ 66 | -------------------------------------------------------------------------------- /test-data/invalid-closings-on-trunk-cvsrepos/proj/deleted-on-vendor-branch.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | TAG-ALL-FILES:1.1 6 | vtag-1:1.1.1.1 7 | vbranchA:1.1.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2004.02.09.15.43.13; author kfogel; state Exp; 14 | branches 15 | 1.1.1.1; 16 | next ; 17 | 18 | 1.1.1.1 19 | date 2004.02.09.15.43.13; author kfogel; state Exp; 20 | branches; 21 | next 1.1.1.2; 22 | 23 | 1.1.1.2 24 | date 2004.02.09.15.43.13; author kfogel; state dead; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 1.1 34 | log 35 | @Initial revision 36 | @ 37 | text 38 | @This is vtag-1 (on vbranchA) of deleted-on-vendor-branch.txt. 39 | @ 40 | 41 | 42 | 1.1.1.1 43 | log 44 | @Import (vbranchA, vtag-1). 45 | @ 46 | text 47 | @@ 48 | 49 | 50 | 1.1.1.2 51 | log 52 | @Import (vbranchA, vtag-3). 53 | @ 54 | text 55 | @d1 1 56 | a1 1 57 | This is vtag-3 (on vbranchA) of deleted-on-vendor-branch.txt. 58 | @ 59 | 60 | 61 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/full-prune-reappear/sub/Attic/first,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @; @; 6 | 7 | 8 | 1.3 9 | date 95.12.30.18.37.22; author jrandom; state dead; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 95.12.11.00.27.53; author jrandom; state dead; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 93.06.18.05.46.07; author jrandom; state Exp; 20 | branches 21 | 1.1.1.1; 22 | next ; 23 | 24 | 1.1.1.1 25 | date 93.06.18.05.46.08; author jrandom; state Exp; 26 | branches; 27 | next ; 28 | 29 | 30 | desc 31 | @@ 32 | 33 | 34 | 1.3 35 | log 36 | @Remove the file 'first' again, which should have no effect. 37 | @ 38 | text 39 | @@ 40 | 41 | 42 | 1.2 43 | log 44 | @Remove the file 'first', for the first time. 45 | 46 | (Note that its sibling 'second' still exists.) 47 | @ 48 | text 49 | @@ 50 | 51 | 52 | 1.1 53 | log 54 | @Initial revision 55 | @ 56 | text 57 | @@ 58 | 59 | 60 | 1.1.1.1 61 | log 62 | @Updated CVS 63 | @ 64 | text 65 | @@ 66 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/AB-double-passthru-loop/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.4; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.4 9 | date 2006.10.30.22.11.43; author mhagger; state Exp; 10 | branches; 11 | next 1.3; 12 | 13 | 1.3 14 | date 2006.10.30.22.11.42; author mhagger; state Exp; 15 | branches; 16 | next 1.2; 17 | 18 | 1.2 19 | date 2006.10.30.22.11.41; author mhagger; state Exp; 20 | branches; 21 | next 1.1; 22 | 23 | 1.1 24 | date 2006.10.30.22.11.40; author mhagger; state Exp; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 1.4 34 | log 35 | @AB-double-passthru-loop-D 36 | @ 37 | text 38 | @1.4 39 | @ 40 | 41 | 42 | 1.3 43 | log 44 | @AB-double-passthru-loop-C 45 | @ 46 | text 47 | @d1 1 48 | a1 1 49 | 1.3 50 | @ 51 | 52 | 53 | 1.2 54 | log 55 | @AB-double-passthru-loop-B 56 | @ 57 | text 58 | @d1 1 59 | a1 1 60 | 1.2 61 | @ 62 | 63 | 64 | 1.1 65 | log 66 | @AB-double-passthru-loop-A 67 | @ 68 | text 69 | @d1 1 70 | a1 1 71 | 1.1 72 | @ 73 | 74 | -------------------------------------------------------------------------------- /test-data/nasty-graphs-cvsrepos/AB-double-passthru-loop/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.4; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.4 9 | date 2006.10.30.22.11.47; author mhagger; state Exp; 10 | branches; 11 | next 1.3; 12 | 13 | 1.3 14 | date 2006.10.30.22.11.46; author mhagger; state Exp; 15 | branches; 16 | next 1.2; 17 | 18 | 1.2 19 | date 2006.10.30.22.11.45; author mhagger; state Exp; 20 | branches; 21 | next 1.1; 22 | 23 | 1.1 24 | date 2006.10.30.22.11.44; author mhagger; state Exp; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 1.4 34 | log 35 | @AB-double-passthru-loop-B 36 | @ 37 | text 38 | @1.4 39 | @ 40 | 41 | 42 | 1.3 43 | log 44 | @AB-double-passthru-loop-A 45 | @ 46 | text 47 | @d1 1 48 | a1 1 49 | 1.3 50 | @ 51 | 52 | 53 | 1.2 54 | log 55 | @AB-double-passthru-loop-D 56 | @ 57 | text 58 | @d1 1 59 | a1 1 60 | 1.2 61 | @ 62 | 63 | 64 | 1.1 65 | log 66 | @AB-double-passthru-loop-C 67 | @ 68 | text 69 | @d1 1 70 | a1 1 71 | 1.1 72 | @ 73 | 74 | -------------------------------------------------------------------------------- /test-data/add-on-branch-cvsrepos/proj/Attic/c.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH2:1.2.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2007.07.05.18.27.28; author mhagger; state dead; 11 | branches 12 | 1.2.2.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2007.07.05.18.27.27; author mhagger; state Exp; 17 | branches; 18 | next ; 19 | 20 | 1.2.2.1 21 | date 2007.07.05.18.27.28; author mhagger; state dead; 22 | branches; 23 | next 1.2.2.2; 24 | 25 | 1.2.2.2 26 | date 2007.07.05.18.27.30; author mhagger; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @Removing c.txt:1.2 38 | @ 39 | text 40 | @1.1 41 | @ 42 | 43 | 44 | 1.2.2.1 45 | log 46 | @file c.txt was added on branch BRANCH2 on 2007-07-05 18:27:30 +0000 47 | @ 48 | text 49 | @d1 1 50 | @ 51 | 52 | 53 | 1.2.2.2 54 | log 55 | @Adding c.txt:1.2.2.2 56 | @ 57 | text 58 | @a0 1 59 | 1.2.2.2 60 | @ 61 | 62 | 63 | 1.1 64 | log 65 | @Adding c.txt:1.1 66 | @ 67 | text 68 | @@ 69 | 70 | -------------------------------------------------------------------------------- /test-data/compose-tag-three-sources-cvsrepos/tagged-on-b1,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | T:1.1.2.1 5 | b2:1.1.0.4 6 | b1:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.2 12 | date 2004.03.16.17.41.23; author max; state Exp; 13 | branches; 14 | next 1.1; 15 | 16 | 1.1 17 | date 2004.03.11.01.46.11; author max; state Exp; 18 | branches 19 | 1.1.2.1 20 | 1.1.4.1; 21 | next ; 22 | 23 | 1.1.2.1 24 | date 2004.03.11.01.49.00; author max; state Exp; 25 | branches; 26 | next ; 27 | 28 | 1.1.4.1 29 | date 2004.03.11.01.49.16; author max; state Exp; 30 | branches; 31 | next ; 32 | 33 | 34 | desc 35 | @@ 36 | 37 | 38 | 1.2 39 | log 40 | @Commit again on trunk 41 | @ 42 | text 43 | @trunk-again 44 | @ 45 | 46 | 47 | 1.1 48 | log 49 | @Add on trunk 50 | @ 51 | text 52 | @d1 1 53 | @ 54 | 55 | 56 | 1.1.4.1 57 | log 58 | @Commit on branch b2 59 | @ 60 | text 61 | @a0 1 62 | b2 63 | @ 64 | 65 | 66 | 1.1.2.1 67 | log 68 | @Commit on branch b1 69 | @ 70 | text 71 | @a0 1 72 | b1 73 | @ 74 | 75 | 76 | -------------------------------------------------------------------------------- /test-data/compose-tag-three-sources-cvsrepos/tagged-on-b2,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | T:1.1.4.1 5 | b2:1.1.0.4 6 | b1:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.2 12 | date 2004.03.16.17.41.24; author max; state Exp; 13 | branches; 14 | next 1.1; 15 | 16 | 1.1 17 | date 2004.03.11.01.46.11; author max; state Exp; 18 | branches 19 | 1.1.2.1 20 | 1.1.4.1; 21 | next ; 22 | 23 | 1.1.2.1 24 | date 2004.03.11.01.49.00; author max; state Exp; 25 | branches; 26 | next ; 27 | 28 | 1.1.4.1 29 | date 2004.03.11.01.49.16; author max; state Exp; 30 | branches; 31 | next ; 32 | 33 | 34 | desc 35 | @@ 36 | 37 | 38 | 1.2 39 | log 40 | @Commit again on trunk 41 | @ 42 | text 43 | @trunk-again 44 | @ 45 | 46 | 47 | 1.1 48 | log 49 | @Add on trunk 50 | @ 51 | text 52 | @d1 1 53 | @ 54 | 55 | 56 | 1.1.4.1 57 | log 58 | @Commit on branch b2 59 | @ 60 | text 61 | @a0 1 62 | b2 63 | @ 64 | 65 | 66 | 1.1.2.1 67 | log 68 | @Commit on branch b1 69 | @ 70 | text 71 | @a0 1 72 | b1 73 | @ 74 | 75 | 76 | -------------------------------------------------------------------------------- /test-data/bogus-branch-copy-cvsrepos/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | branch-boom:1.2.0.16; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.03.29.23.11.45; author harry; state Exp; 11 | branches 12 | 1.2.16.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2005.03.24.22.00.30; author sally; state dead; 17 | branches; 18 | next ; 19 | 20 | 1.2.16.1 21 | date 2005.03.29.23.11.45; author harry; state dead; 22 | branches; 23 | next 1.2.16.2; 24 | 25 | 1.2.16.2 26 | date 2005.04.01.23.13.40; author harry; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @merged sally to trunk 38 | @ 39 | text 40 | @@ 41 | 42 | 43 | 1.2.16.1 44 | log 45 | @file file1.txt was added on branch branch-boom on 2005-04-01 23:13:40 +0000 46 | @ 47 | text 48 | @@ 49 | 50 | 51 | 1.2.16.2 52 | log 53 | @merged trunk to ira 54 | @ 55 | text 56 | @@ 57 | 58 | 59 | 1.1 60 | log 61 | @file file1.txt was initially added on branch branch-sally. 62 | @ 63 | text 64 | @@ 65 | -------------------------------------------------------------------------------- /test-data/compose-tag-three-sources-cvsrepos/tagged-on-trunk-1.1,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | T:1.1 5 | b2:1.1.0.4 6 | b1:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.2 12 | date 2004.03.16.17.41.23; author max; state Exp; 13 | branches; 14 | next 1.1; 15 | 16 | 1.1 17 | date 2004.03.11.01.46.11; author max; state Exp; 18 | branches 19 | 1.1.2.1 20 | 1.1.4.1; 21 | next ; 22 | 23 | 1.1.2.1 24 | date 2004.03.11.01.49.00; author max; state Exp; 25 | branches; 26 | next ; 27 | 28 | 1.1.4.1 29 | date 2004.03.11.01.49.16; author max; state Exp; 30 | branches; 31 | next ; 32 | 33 | 34 | desc 35 | @@ 36 | 37 | 38 | 1.2 39 | log 40 | @Commit again on trunk 41 | @ 42 | text 43 | @trunk-again 44 | @ 45 | 46 | 47 | 1.1 48 | log 49 | @Add on trunk 50 | @ 51 | text 52 | @d1 1 53 | @ 54 | 55 | 56 | 1.1.4.1 57 | log 58 | @Commit on branch b2 59 | @ 60 | text 61 | @a0 1 62 | b2 63 | @ 64 | 65 | 66 | 1.1.2.1 67 | log 68 | @Commit on branch b1 69 | @ 70 | text 71 | @a0 1 72 | b1 73 | @ 74 | 75 | 76 | -------------------------------------------------------------------------------- /test-data/compose-tag-three-sources-cvsrepos/tagged-on-trunk-1.2-a,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | T:1.2 5 | b2:1.1.0.4 6 | b1:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.2 12 | date 2004.03.16.17.41.23; author max; state Exp; 13 | branches; 14 | next 1.1; 15 | 16 | 1.1 17 | date 2004.03.11.01.46.11; author max; state Exp; 18 | branches 19 | 1.1.2.1 20 | 1.1.4.1; 21 | next ; 22 | 23 | 1.1.2.1 24 | date 2004.03.11.01.49.00; author max; state Exp; 25 | branches; 26 | next ; 27 | 28 | 1.1.4.1 29 | date 2004.03.11.01.49.16; author max; state Exp; 30 | branches; 31 | next ; 32 | 33 | 34 | desc 35 | @@ 36 | 37 | 38 | 1.2 39 | log 40 | @Commit again on trunk 41 | @ 42 | text 43 | @trunk-again 44 | @ 45 | 46 | 47 | 1.1 48 | log 49 | @Add on trunk 50 | @ 51 | text 52 | @d1 1 53 | @ 54 | 55 | 56 | 1.1.4.1 57 | log 58 | @Commit on branch b2 59 | @ 60 | text 61 | @a0 1 62 | b2 63 | @ 64 | 65 | 66 | 1.1.2.1 67 | log 68 | @Commit on branch b1 69 | @ 70 | text 71 | @a0 1 72 | b1 73 | @ 74 | 75 | 76 | -------------------------------------------------------------------------------- /test-data/compose-tag-three-sources-cvsrepos/tagged-on-trunk-1.2-b,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | T:1.2 5 | b2:1.1.0.4 6 | b1:1.1.0.2; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.2 12 | date 2004.03.16.17.41.23; author max; state Exp; 13 | branches; 14 | next 1.1; 15 | 16 | 1.1 17 | date 2004.03.11.01.46.11; author max; state Exp; 18 | branches 19 | 1.1.2.1 20 | 1.1.4.1; 21 | next ; 22 | 23 | 1.1.2.1 24 | date 2004.03.11.01.49.00; author max; state Exp; 25 | branches; 26 | next ; 27 | 28 | 1.1.4.1 29 | date 2004.03.11.01.49.16; author max; state Exp; 30 | branches; 31 | next ; 32 | 33 | 34 | desc 35 | @@ 36 | 37 | 38 | 1.2 39 | log 40 | @Commit again on trunk 41 | @ 42 | text 43 | @trunk-again 44 | @ 45 | 46 | 47 | 1.1 48 | log 49 | @Add on trunk 50 | @ 51 | text 52 | @d1 1 53 | @ 54 | 55 | 56 | 1.1.4.1 57 | log 58 | @Commit on branch b2 59 | @ 60 | text 61 | @a0 1 62 | b2 63 | @ 64 | 65 | 66 | 1.1.2.1 67 | log 68 | @Commit on branch b1 69 | @ 70 | text 71 | @a0 1 72 | b1 73 | @ 74 | 75 | 76 | -------------------------------------------------------------------------------- /test-data/double-fill2-cvsrepos/proj/a.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | BRANCH2:1.2.0.4 5 | BRANCH1:1.2.0.2; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.3 11 | date 2005.03.23.16.45.45; author author2; state Exp; 12 | branches; 13 | next 1.2; 14 | 15 | 1.2 16 | date 2004.02.27.22.01.32; author author3; state Exp; 17 | branches 18 | 1.2.2.1 19 | 1.2.4.1; 20 | next 1.1; 21 | 22 | 1.1 23 | date 2003.12.22.20.09.23; author author4; state Exp; 24 | branches; 25 | next ; 26 | 27 | 1.2.2.1 28 | date 2005.05.05.04.07.24; author author2; state Exp; 29 | branches; 30 | next ; 31 | 32 | 1.2.4.1 33 | date 2005.05.05.20.56.37; author author6; state Exp; 34 | branches; 35 | next ; 36 | 37 | 38 | desc 39 | @@ 40 | 41 | 42 | 1.3 43 | log 44 | @log 5@ 45 | text 46 | @@ 47 | 48 | 49 | 1.2 50 | log 51 | @log 6@ 52 | text 53 | @@ 54 | 55 | 56 | 1.2.4.1 57 | log 58 | @log 7@ 59 | text 60 | @@ 61 | 62 | 63 | 1.2.2.1 64 | log 65 | @log 9@ 66 | text 67 | @@ 68 | 69 | 70 | 1.1 71 | log 72 | @log 10@ 73 | text 74 | @@ 75 | -------------------------------------------------------------------------------- /test-data/add-on-branch-cvsrepos/proj/d.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH3:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2007.07.05.20.37.52; author mhagger; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2007.07.05.18.27.32; author mhagger; state Exp; 16 | branches 17 | 1.1.2.1; 18 | next ; 19 | 20 | 1.1.2.1 21 | date 2007.07.05.18.27.32; author mhagger; state dead; 22 | branches; 23 | next 1.1.2.2; 24 | 25 | 1.1.2.2 26 | date 2007.07.05.18.27.35; author mhagger; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @Changing d.txt:1.2 38 | @ 39 | text 40 | @1.2 41 | @ 42 | 43 | 44 | 1.1 45 | log 46 | @Adding d.txt:1.1 47 | @ 48 | text 49 | @d1 1 50 | a1 1 51 | 1.1 52 | @ 53 | 54 | 55 | 1.1.2.1 56 | log 57 | @file d.txt was added on branch BRANCH3 on 2007-07-05 18:27:35 +0000 58 | @ 59 | text 60 | @d1 1 61 | @ 62 | 63 | 64 | 1.1.2.2 65 | log 66 | @Adding d.txt:1.1.2.2 67 | @ 68 | text 69 | @a0 1 70 | 1.1.2.2 71 | @ 72 | 73 | 74 | -------------------------------------------------------------------------------- /test-data/double-add-cvsrepos/Attic/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | boom-branch:1.2.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.03.04.19.57.41; author harry; state Exp; 11 | branches 12 | 1.2.2.1; 13 | next 1.1; 14 | 15 | 1.1 16 | date 2005.03.04.18.57.55; author sally; state dead; 17 | branches; 18 | next ; 19 | 20 | 1.2.2.1 21 | date 2005.03.04.19.57.41; author harry; state dead; 22 | branches; 23 | next 1.2.2.2; 24 | 25 | 1.2.2.2 26 | date 2005.03.04.21.02.34; author harry; state Exp; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.2 36 | log 37 | @merged some-branch to trunk 38 | @ 39 | text 40 | @@ 41 | 42 | 43 | 1.2.2.1 44 | log 45 | @file file2.txt was added on branch boom-branch on 2005-03-04 21:02:34 +0000 46 | @ 47 | text 48 | @@ 49 | 50 | 51 | 1.2.2.2 52 | log 53 | @merged trunk to another-branch 54 | @ 55 | text 56 | @@ 57 | 58 | 59 | 1.1 60 | log 61 | @file file2.txt was initially added on branch some-branch. 62 | @ 63 | text 64 | @@ 65 | 66 | 67 | -------------------------------------------------------------------------------- /test-data/multiply-defined-symbols-cvsrepos/cvs2svn-ignore.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # Fix a problem with multiply-defined symbols by ignoring one copy of 4 | # each symbol. 5 | 6 | from cvs2svn_lib.symbol_transform import SymbolMapper 7 | 8 | execfile('cvs2svn-example.options') 9 | 10 | name = 'multiply-defined-symbols' 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/%s--options=cvs2svn-ignore.options-svnrepos' % (name,), 14 | ) 15 | 16 | run_options.clear_projects() 17 | 18 | filename = 'test-data/%s-cvsrepos/proj/default,v' % (name,) 19 | symbol_mapper = SymbolMapper([ 20 | (filename, 'BRANCH', '1.2.4', None), 21 | (filename, 'TAG', '1.2', None), 22 | ]) 23 | 24 | run_options.add_project( 25 | r'test-data/%s-cvsrepos' % (name,), 26 | trunk_path='trunk', 27 | branches_path='branches', 28 | tags_path='tags', 29 | symbol_transforms=[ 30 | symbol_mapper, 31 | ], 32 | symbol_strategy_rules=global_symbol_strategy_rules, 33 | ) 34 | 35 | -------------------------------------------------------------------------------- /test-data/repeated-deltatext-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | uves_2_0_0:1.3 5 | UVES-1_3_0-beta1a:1.1; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.3 11 | date 2003.06.30.12.59.08; author amodigli; state Exp; 12 | branches; 13 | next 1.2; 14 | 15 | 1.2 16 | date 2003.06.30.12.54.52; author amodigli; state Exp; 17 | branches; 18 | next 1.1; 19 | 20 | 1.1 21 | date 2002.02.11.17.59.51; author amodigli; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.3 31 | log 32 | @uves-2.0.0-rep 33 | @ 34 | text 35 | @ COMMON /QC_LOG/MID_S_N_CENT,OBJ_POS_CENT, 36 | + FWHM,N_CURR_ORD !to not pass a parameter to G_PROF 37 | @ 38 | 39 | 40 | 1.2 41 | log 42 | @uves-2.0.0 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1 49 | log 50 | @1st release 51 | @ 52 | text 53 | @@ 54 | 55 | 56 | 1.1 57 | log 58 | @Created 59 | @ 60 | text 61 | @ COMMON /QC_LOG/MID_S_N_CENT,OBJ_POS_CENT, 62 | + FWHM,N_CURR_ORD !to not pass a parameter to G_PROF 63 | @ 64 | -------------------------------------------------------------------------------- /test-data/multiply-defined-symbols-cvsrepos/cvs2svn-rename.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # Fix a problem with multiply-defined symbols by renaming one copy of 4 | # each symbol. 5 | 6 | from cvs2svn_lib.symbol_transform import SymbolMapper 7 | 8 | execfile('cvs2svn-example.options') 9 | 10 | name = 'multiply-defined-symbols' 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/%s--options=cvs2svn-rename.options-svnrepos' % (name,), 14 | ) 15 | 16 | run_options.clear_projects() 17 | 18 | filename = 'test-data/%s-cvsrepos/proj/default,v' % (name,) 19 | symbol_mapper = SymbolMapper([ 20 | (filename, 'BRANCH', '1.2.4', 'BRANCH2'), 21 | (filename, 'TAG', '1.2', 'TAG2'), 22 | ]) 23 | 24 | run_options.add_project( 25 | r'test-data/%s-cvsrepos' % (name,), 26 | trunk_path='trunk', 27 | branches_path='branches', 28 | tags_path='tags', 29 | symbol_transforms=[ 30 | symbol_mapper, 31 | ], 32 | symbol_strategy_rules=global_symbol_strategy_rules, 33 | ) 34 | 35 | -------------------------------------------------------------------------------- /test-data/peer-path-pruning-cvsrepos/bar/five.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 5 | vendorbranch:1.1.1; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.3 11 | date 2004.06.07.18.42.06; author kfogel; state Exp; 12 | branches; 13 | next 1.2; 14 | 15 | 1.2 16 | date 2004.06.07.18.38.34; author kfogel; state Exp; 17 | branches; 18 | next 1.1; 19 | 20 | 1.1 21 | date 2003.05.24.01.02.01; author kfogel; state Exp; 22 | branches 23 | 1.1.1.1; 24 | next ; 25 | 26 | 1.1.1.1 27 | date 2003.05.24.01.02.01; author kfogel; state Exp; 28 | branches; 29 | next ; 30 | 31 | 32 | desc 33 | @@ 34 | 35 | 36 | 1.3 37 | log 38 | @Commit 1.3 of every file. 39 | @ 40 | text 41 | @Another small change. 42 | @ 43 | 44 | 45 | 1.2 46 | log 47 | @Commit 1.2 of every file. 48 | @ 49 | text 50 | @d1 1 51 | a1 1 52 | A small change. 53 | @ 54 | 55 | 56 | 1.1 57 | log 58 | @Initial revision 59 | @ 60 | text 61 | @d1 1 62 | a1 1 63 | This is the first revision. 64 | @ 65 | 66 | 67 | 1.1.1.1 68 | log 69 | @Initial import. 70 | @ 71 | text 72 | @@ 73 | -------------------------------------------------------------------------------- /test-data/peer-path-pruning-cvsrepos/bar/six.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | vendortag:1.1.1.1 5 | vendorbranch:1.1.1; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.3 11 | date 2004.06.07.18.42.06; author kfogel; state Exp; 12 | branches; 13 | next 1.2; 14 | 15 | 1.2 16 | date 2004.06.07.18.38.34; author kfogel; state Exp; 17 | branches; 18 | next 1.1; 19 | 20 | 1.1 21 | date 2003.05.24.01.02.01; author kfogel; state Exp; 22 | branches 23 | 1.1.1.1; 24 | next ; 25 | 26 | 1.1.1.1 27 | date 2003.05.24.01.02.01; author kfogel; state Exp; 28 | branches; 29 | next ; 30 | 31 | 32 | desc 33 | @@ 34 | 35 | 36 | 1.3 37 | log 38 | @Commit 1.3 of every file. 39 | @ 40 | text 41 | @Another small change. 42 | @ 43 | 44 | 45 | 1.2 46 | log 47 | @Commit 1.2 of every file. 48 | @ 49 | text 50 | @d1 1 51 | a1 1 52 | A small change. 53 | @ 54 | 55 | 56 | 1.1 57 | log 58 | @Initial revision 59 | @ 60 | text 61 | @d1 1 62 | a1 1 63 | This is the first revision. 64 | @ 65 | 66 | 67 | 1.1.1.1 68 | log 69 | @Initial import. 70 | @ 71 | text 72 | @@ 73 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/proj/sub2/Attic/branch_B_MIXED_only,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | B_MIXED:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2003.05.23.00.25.26; author jrandom; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2003.05.23.00.25.26; author jrandom; state Exp; 17 | branches; 18 | next 1.1.2.2; 19 | 20 | 1.1.2.2 21 | date 2003.05.23.00.48.51; author jrandom; state Exp; 22 | branches; 23 | next ; 24 | 25 | 26 | desc 27 | @@ 28 | 29 | 30 | 1.1 31 | log 32 | @file branch_B_MIXED_only was initially added on branch B_MIXED. 33 | @ 34 | text 35 | @@ 36 | 37 | 38 | 1.1.2.1 39 | log 40 | @Add a file on branch B_MIXED. 41 | @ 42 | text 43 | @a0 1 44 | This file was added on branch B_MIXED. It never existed on trunk. 45 | @ 46 | 47 | 48 | 1.1.2.2 49 | log 50 | @A single commit affecting one file on branch B_MIXED and one on trunk. 51 | @ 52 | text 53 | @a1 3 54 | 55 | The same commit added these two lines here on branch B_MIXED, and two 56 | similar lines to ./default on trunk. 57 | @ 58 | 59 | 60 | -------------------------------------------------------------------------------- /COMMITTERS.md: -------------------------------------------------------------------------------- 1 | # Committers 2 | 3 | The following people had commit access to cvs2svn when it was in 4 | Subversion. This is not a full list of cvs2svn's authors, however — 5 | for that, you'd need to look over the log messages to see all the 6 | patch contributors. 7 | 8 | If you have a question or comment, please go to 9 | https://github.com/mhagger/cvs2svn, rather than mailing any of these 10 | people directly. 11 | 12 | cmpilato C. Michael Pilato 13 | gstein Greg Stein 14 | brane Branko Čibej 15 | blair Blair Zajac 16 | maxb Max Bowsher 17 | fitz Brian W. Fitzpatrick 18 | ringstrom Tobias Ringström 19 | kfogel Karl Fogel 20 | dionisos Erik Hülsmann 21 | david David Summers 22 | mhagger Michael Haggerty 23 | ossi Oswald Buddenhagen 24 | -------------------------------------------------------------------------------- /test-data/branch-from-deleted-1-1-cvsrepos/proj/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | TAG1:1.1 5 | BRANCH3:1.1.0.6 6 | BRANCH2:1.1.0.4 7 | BRANCH1:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.2 13 | date 2007.06.25.22.20.17; author mhagger; state Exp; 14 | branches; 15 | next 1.1; 16 | 17 | 1.1 18 | date 2007.06.25.22.20.15; author mhagger; state dead; 19 | branches 20 | 1.1.2.1 21 | 1.1.4.1; 22 | next ; 23 | 24 | 1.1.2.1 25 | date 2007.06.25.22.20.15; author mhagger; state Exp; 26 | branches; 27 | next ; 28 | 29 | 1.1.4.1 30 | date 2007.06.25.22.20.16; author mhagger; state Exp; 31 | branches; 32 | next ; 33 | 34 | 35 | desc 36 | @@ 37 | 38 | 39 | 1.2 40 | log 41 | @Adding b.txt:1.2 42 | @ 43 | text 44 | @1.2 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @file b.txt was initially added on branch BRANCH1. 51 | @ 52 | text 53 | @d1 1 54 | @ 55 | 56 | 57 | 1.1.4.1 58 | log 59 | @Adding b.txt:1.1.4.1 60 | @ 61 | text 62 | @a0 1 63 | 1.1.4.1 64 | @ 65 | 66 | 67 | 1.1.2.1 68 | log 69 | @Adding b.txt:1.1.2.1 70 | @ 71 | text 72 | @a0 1 73 | 1.1.2.1 74 | @ 75 | 76 | -------------------------------------------------------------------------------- /test-data/crossed-branches-cvsrepos/proj/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH4:1.2.0.4 5 | BRANCH3:1.2.0.2 6 | BRANCH2:1.1.0.4 7 | BRANCH1:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.2 13 | date 2007.01.20.14.54.27; author mhagger; state Exp; 14 | branches 15 | 1.2.2.1 16 | 1.2.4.1; 17 | next 1.1; 18 | 19 | 1.1 20 | date 2007.01.20.14.45.02; author mhagger; state Exp; 21 | branches; 22 | next ; 23 | 24 | 1.2.2.1 25 | date 2007.01.20.14.56.46; author mhagger; state Exp; 26 | branches; 27 | next ; 28 | 29 | 1.2.4.1 30 | date 2007.01.20.14.57.11; author mhagger; state Exp; 31 | branches; 32 | next ; 33 | 34 | 35 | desc 36 | @@ 37 | 38 | 39 | 1.2 40 | log 41 | @Revisions 1.2 42 | @ 43 | text 44 | @1.2 45 | @ 46 | 47 | 48 | 1.2.4.1 49 | log 50 | @Shared commit message 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | BRANCH4 commit 56 | @ 57 | 58 | 59 | 1.2.2.1 60 | log 61 | @Shared commit message 62 | @ 63 | text 64 | @d1 1 65 | a1 1 66 | BRANCH3 commit 67 | @ 68 | 69 | 70 | 1.1 71 | log 72 | @Adding two files 73 | @ 74 | text 75 | @d1 1 76 | @ 77 | 78 | -------------------------------------------------------------------------------- /test-data/crossed-branches-cvsrepos/proj/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | BRANCH3:1.2.0.4 5 | BRANCH4:1.2.0.2 6 | BRANCH1:1.1.0.4 7 | BRANCH2:1.1.0.2; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.2 13 | date 2007.01.20.14.54.27; author mhagger; state Exp; 14 | branches 15 | 1.2.2.1 16 | 1.2.4.1; 17 | next 1.1; 18 | 19 | 1.1 20 | date 2007.01.20.14.45.02; author mhagger; state Exp; 21 | branches; 22 | next ; 23 | 24 | 1.2.2.1 25 | date 2007.01.20.14.57.11; author mhagger; state Exp; 26 | branches; 27 | next ; 28 | 29 | 1.2.4.1 30 | date 2007.01.20.14.56.46; author mhagger; state Exp; 31 | branches; 32 | next ; 33 | 34 | 35 | desc 36 | @@ 37 | 38 | 39 | 1.2 40 | log 41 | @Revisions 1.2 42 | @ 43 | text 44 | @1.2 45 | @ 46 | 47 | 48 | 1.2.2.1 49 | log 50 | @Shared commit message 51 | @ 52 | text 53 | @d1 1 54 | a1 1 55 | BRANCH4 commit 56 | @ 57 | 58 | 59 | 1.2.4.1 60 | log 61 | @Shared commit message 62 | @ 63 | text 64 | @d1 1 65 | a1 1 66 | BRANCH3 commit 67 | @ 68 | 69 | 70 | 1.1 71 | log 72 | @Adding two files 73 | @ 74 | text 75 | @d1 1 76 | @ 77 | 78 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/thread/README,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | libshout-2_0:1.1.1.1 6 | libshout-2_0b3:1.1.1.1 7 | libshout-2_0b2:1.1.1.1 8 | libshout_2_0b1:1.1.1.1 9 | libogg2-zerocopy:1.1.1.1.0.4 10 | branch-beta2-rewrite:1.1.1.1.0.2 11 | start:1.1.1.1 12 | xiph:1.1.1; 13 | locks; strict; 14 | comment @# @; 15 | 16 | 17 | 1.1 18 | date 2001.09.10.02.26.32; author jack; state Exp; 19 | branches 20 | 1.1.1.1; 21 | next ; 22 | 23 | 1.1.1.1 24 | date 2001.09.10.02.26.32; author jack; state Exp; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 34 | 1.1 35 | log 36 | @Initial revision 37 | @ 38 | text 39 | @This is the cross platform thread and syncronization library. 40 | 41 | It depends on the avl library. 42 | 43 | This is a massively cleaned and picked through version of the code from 44 | the icecast 1.3.x base. It has not been heavily tested *YET*. But since 45 | it's just cleanups, it really shouldn't have that many problems. 46 | 47 | jack. 48 | @ 49 | 50 | 51 | 1.1.1.1 52 | log 53 | @move to cvs 54 | @ 55 | text 56 | @@ 57 | -------------------------------------------------------------------------------- /test-data/missing-deltatext-cvsrepos/file001,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @# @; 6 | 7 | 8 | 1.1 9 | date 2003.02.14.12.21.04; author author1; state dead; 10 | branches 11 | 1.1.2.1 12 | 1.1.4.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2003.02.14.12.21.04; author author1; state Exp; 17 | branches; 18 | next ; 19 | 20 | 1.1.4.1 21 | date 2003.02.14.18.28.37; author author1; state Exp; 22 | branches; 23 | next 1.1.4.2; 24 | 25 | 1.1.4.2 26 | date 2003.02.28.13.31.47; author author1; state dead; 27 | branches; 28 | next 1.1.4.3; 29 | 30 | 1.1.4.3 31 | date 2003.02.28.14.25.24; author author2; state Exp; 32 | branches; 33 | next 1.1.4.4; 34 | 35 | 1.1.4.4 36 | date 2003.05.02.21.55.01; author author3; state dead; 37 | branches; 38 | next ; 39 | 40 | 41 | desc 42 | @@ 43 | 44 | 45 | 1.1 46 | log 47 | @log 1@ 48 | text 49 | @@ 50 | 51 | 52 | 1.1.4.1 53 | log 54 | @log 2@ 55 | text 56 | @@ 57 | 58 | 59 | 1.1.4.2 60 | log 61 | @log 3@ 62 | text 63 | @@ 64 | 65 | 66 | 1.1.4.3 67 | log 68 | @log 4@ 69 | text 70 | @@ 71 | 72 | 73 | 1.1.2.1 74 | log 75 | @log 5@ 76 | text 77 | @@ 78 | -------------------------------------------------------------------------------- /test-data/double-delete-cvsrepos/twice-removed,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols; 4 | locks; strict; 5 | comment @; @; 6 | 7 | 8 | 1.3 9 | date 95.12.30.18.37.22; author jrandom; state dead; 10 | branches; 11 | next 1.2; 12 | 13 | 1.2 14 | date 95.12.11.00.27.53; author jrandom; state dead; 15 | branches; 16 | next 1.1; 17 | 18 | 1.1 19 | date 93.06.18.05.46.07; author jrandom; state Exp; 20 | branches 21 | 1.1.1.1; 22 | next ; 23 | 24 | 1.1.1.1 25 | date 93.06.18.05.46.08; author jrandom; state Exp; 26 | branches; 27 | next ; 28 | 29 | 30 | desc 31 | @@ 32 | 33 | 34 | 1.3 35 | log 36 | @Remove this file for the second time, which should have no effect. 37 | @ 38 | text 39 | @The original text of this file was much longer, but we didn't 40 | need it for the regression test, so we removed it. It was 41 | src/gnu/usr.bin/cvs/contrib/pcl-cvs/Attic/cookie.el,v in the FreeBSD 42 | CVS repository. 43 | @ 44 | 45 | 46 | 1.2 47 | log 48 | @Remove this file for the first time. 49 | @ 50 | text 51 | @@ 52 | 53 | 54 | 1.1 55 | log 56 | @Initial revision 57 | @ 58 | text 59 | @@ 60 | 61 | 62 | 1.1.1.1 63 | log 64 | @Updated CVS 65 | @ 66 | text 67 | @@ 68 | -------------------------------------------------------------------------------- /test-data/double-branch-delete-cvsrepos/IMarshalledValue.java,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | Branch_4_0:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2005.12.15.20.18.27; author csuconic; state Exp; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2005.12.15.20.18.27; author csuconic; state dead; 17 | branches; 18 | next 1.1.2.3; 19 | 20 | 1.1.2.3 21 | date 2005.12.15.20.33.41; author csuconic; state Exp; 22 | branches; 23 | next 1.1.2.4; 24 | 25 | 1.1.2.4 26 | date 2006.03.29.04.16.05; author csuconic; state dead; 27 | branches; 28 | next ; 29 | 30 | 31 | desc 32 | @@ 33 | 34 | 35 | 1.1 36 | log 37 | @JBAS-2436 - Adding IMarshalledValue to common - required piece for integrating Pluggable Serialization 38 | @ 39 | text 40 | @@ 41 | 42 | 43 | 1.1.2.1 44 | log 45 | @file IMarshalledValue.java was added on branch Branch_4_0 on 2005-12-15 20:18:49 +0000 46 | @ 47 | text 48 | @@ 49 | 50 | 51 | 1.1.2.3 52 | log 53 | @JBAS-2436 - Adding LGPL Header2 54 | @ 55 | text 56 | @@ 57 | 58 | 59 | 1.1.2.4 60 | log 61 | @JBAS-3025 - Removing dependency on commons/IMarshalledValue 62 | @ 63 | text 64 | @@ 65 | 66 | 67 | -------------------------------------------------------------------------------- /test-data/bogus-branch-copy-cvsrepos/Attic/file3.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | branch-boom:1.1.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.1 10 | date 2005.03.04.18.57.55; author ira; state dead; 11 | branches 12 | 1.1.2.1; 13 | next ; 14 | 15 | 1.1.2.1 16 | date 2005.03.04.18.57.55; author ira; state Exp; 17 | branches; 18 | next 1.1.2.2; 19 | 20 | 1.1.2.2 21 | date 2005.03.28.22.18.05; author ira; state Exp; 22 | branches; 23 | next 1.1.2.3; 24 | 25 | 1.1.2.3 26 | date 2005.03.29.20.21.54; author ira; state Exp; 27 | branches; 28 | next 1.1.2.4; 29 | 30 | 1.1.2.4 31 | date 2005.04.05.15.47.56; author ira; state dead; 32 | branches; 33 | next ; 34 | 35 | 36 | desc 37 | @@ 38 | 39 | 40 | 1.1 41 | log 42 | @file file3.txt was initially added on branch branch-boom. 43 | @ 44 | text 45 | @@ 46 | 47 | 48 | 1.1.2.1 49 | log 50 | @This is a log message. 51 | @ 52 | text 53 | @@ 54 | 55 | 56 | 1.1.2.2 57 | log 58 | @This is another log message. 59 | @ 60 | text 61 | @@ 62 | 63 | 64 | 1.1.2.3 65 | log 66 | @This is yet another log message. 67 | @ 68 | text 69 | @@ 70 | 71 | 72 | 1.1.2.4 73 | log 74 | @ci 75 | @ 76 | text 77 | @@ 78 | 79 | 80 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/cvs2svn-crossproject.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # As a partial check that the example options file is functional, we 4 | # use it as the basis for this test. We only need to overwrite the 5 | # output option to get the output repository in the location expected 6 | # by the test infrastructure. 7 | 8 | import os 9 | 10 | execfile('cvs2svn-example.options') 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/main--options=cvs2svn-crossproject.options-svnrepos', 14 | ) 15 | 16 | ctx.cross_project_commits = True 17 | ctx.cross_branch_commits = False 18 | 19 | run_options.clear_projects() 20 | 21 | for project in [ 22 | 'full-prune', 23 | 'full-prune-reappear', 24 | 'interleaved', 25 | 'partial-prune', 26 | 'proj', 27 | 'single-files', 28 | ]: 29 | run_options.add_project( 30 | os.path.join(r'test-data/main-cvsrepos', project), 31 | trunk_path='%s/trunk' % (project,), 32 | branches_path='%s/branches' % (project,), 33 | tags_path='%s/tags' % (project,), 34 | symbol_strategy_rules=global_symbol_strategy_rules, 35 | ) 36 | 37 | -------------------------------------------------------------------------------- /test-data/branch-delete-first-cvsrepos/file,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | branch-3:1.1.0.6 5 | branch-2:1.1.0.4 6 | branch-1:1.1.0.2 7 | import:1.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.3 13 | date 2003.01.17.06.56.24; author joeuser; state Exp; 14 | branches; 15 | next 1.2; 16 | 17 | 1.2 18 | date 2003.01.17.06.48.54; author joeuser; state Exp; 19 | branches; 20 | next 1.1; 21 | 22 | 1.1 23 | date 2003.01.15.06.21.59; author joeuser; state Exp; 24 | branches 25 | 1.1.2.1 26 | 1.1.4.1; 27 | next ; 28 | 29 | 1.1.2.1 30 | date 2003.01.17.00.34.20; author joeuser; state dead; 31 | branches; 32 | next ; 33 | 34 | 1.1.4.1 35 | date 2003.01.16.00.16.39; author joeuser; state dead; 36 | branches; 37 | next ; 38 | 39 | 40 | desc 41 | @@ 42 | 43 | 44 | 1.3 45 | log 46 | @1.3 47 | @ 48 | text 49 | @ 1.3 50 | @ 51 | 52 | 53 | 1.2 54 | log 55 | @1.2 56 | @ 57 | text 58 | @d1 1 59 | a1 1 60 | 1.2 61 | @ 62 | 63 | 64 | 1.1 65 | log 66 | @1.1 67 | @ 68 | text 69 | @d1 1 70 | a1 1 71 | 1.1 72 | @ 73 | 74 | 75 | 1.1.2.1 76 | log 77 | @1.1.2.1 78 | @ 79 | text 80 | @@ 81 | 82 | 83 | 1.1.4.1 84 | log 85 | @1.1.4.1 86 | @ 87 | text 88 | @@ 89 | 90 | -------------------------------------------------------------------------------- /test-data/double-add-cvsrepos/file.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | my-branch:1.2.0.2 5 | boom-branch:1.2.0.4; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.2 11 | date 2005.02.10.19.45.43; author harry; state Exp; 12 | branches 13 | 1.2.2.1 14 | 1.2.4.1; 15 | next 1.1; 16 | 17 | 1.1 18 | date 2005.01.27.22.11.00; author sally; state dead; 19 | branches; 20 | next ; 21 | 22 | 1.2.2.1 23 | date 2005.03.04.21.06.12; author harry; state Exp; 24 | branches; 25 | next 1.2.2.2; 26 | 27 | 1.2.2.2 28 | date 2005.04.01.23.09.43; author harry; state Exp; 29 | branches; 30 | next ; 31 | 32 | 1.2.4.1 33 | date 2005.03.04.21.02.34; author harry; state Exp; 34 | branches; 35 | next ; 36 | 37 | desc 38 | @@ 39 | 40 | 41 | 1.2 42 | log 43 | @merged some-branch to trunk 44 | @ 45 | text 46 | @@ 47 | 48 | 49 | 1.2.2.1 50 | log 51 | @merged trunk to my-branch 52 | @ 53 | text 54 | @@ 55 | 56 | 57 | 1.2.2.2 58 | log 59 | @merged trunk to my-branch 60 | @ 61 | text 62 | @@ 63 | 64 | 65 | 1.2.4.1 66 | log 67 | @merged trunk to another-branch 68 | @ 69 | text 70 | @@ 71 | 72 | 73 | 1.1 74 | log 75 | @file file.txt was initially added on branch BRANCH-sally. 76 | @ 77 | text 78 | @@ 79 | -------------------------------------------------------------------------------- /test-data/many-deletes-cvsrepos/proj/Attic/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | access; 3 | symbols 4 | BRANCH2:1.1.0.4 5 | BRANCH:1.1.0.2 6 | TAG:1.1 7 | TAG2:1.1.4.1; 8 | locks; strict; 9 | comment @# @; 10 | 11 | 12 | 1.1 13 | date 2009.09.04.09.45.32; author mhagger; state dead; 14 | branches 15 | 1.1.2.1 16 | 1.1.4.1; 17 | next ; 18 | commitid Jeo5F7Vn6nyLrl2u; 19 | 20 | 1.1.2.1 21 | date 2009.09.04.09.45.32; author mhagger; state Exp; 22 | branches; 23 | next ; 24 | commitid Jeo5F7Vn6nyLrl2u; 25 | 26 | 1.1.4.1 27 | date 2009.09.04.09.45.32; author mhagger; state dead; 28 | branches; 29 | next 1.1.4.2; 30 | commitid l4kyUGsxvoE1sl2u; 31 | 32 | 1.1.4.2 33 | date 2009.09.04.09.46.18; author mhagger; state Exp; 34 | branches; 35 | next ; 36 | commitid l4kyUGsxvoE1sl2u; 37 | 38 | 39 | desc 40 | @@ 41 | 42 | 43 | 1.1 44 | log 45 | @file b.txt was initially added on branch BRANCH. 46 | @ 47 | text 48 | @@ 49 | 50 | 51 | 1.1.4.1 52 | log 53 | @file b.txt was added on branch BRANCH2 on 2009-09-04 09:46:18 +0000 54 | @ 55 | text 56 | @@ 57 | 58 | 59 | 1.1.4.2 60 | log 61 | @Add files on BRANCH2. 62 | @ 63 | text 64 | @@ 65 | 66 | 67 | 1.1.2.1 68 | log 69 | @Add files on BRANCH. 70 | @ 71 | text 72 | @@ 73 | 74 | -------------------------------------------------------------------------------- /cvs2svn_lib/test/sort-test: -------------------------------------------------------------------------------- 1 | #! /usr/bin/python 2 | 3 | """A trivial test of sorting a large number of tiny files. 4 | 5 | This is mostly to verify that hierarchical merging doesn't blow up due 6 | to opening too many files at once.""" 7 | 8 | 9 | import sys 10 | import os 11 | import shutil 12 | 13 | SRCPATH = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..')) 14 | sys.path.insert(0, os.path.join(SRCPATH)) 15 | 16 | from cvs2svn_lib import sort 17 | 18 | 19 | TMPDIR = 'cvs2svn-tmp' 20 | NUMFILES = 2200 21 | LINES_PER_FILE = 5 22 | 23 | OUTFILE = os.path.join(TMPDIR, 'out.dat') 24 | 25 | try: 26 | shutil.rmtree(TMPDIR) 27 | except: 28 | pass 29 | 30 | filenames = [ 31 | os.path.join(TMPDIR, '%04d.dat' % (i,)) 32 | for i in range(NUMFILES) 33 | ] 34 | 35 | os.makedirs(TMPDIR) 36 | for (i, filename) in enumerate(filenames): 37 | f = open(filename, 'w') 38 | for j in range(LINES_PER_FILE): 39 | f.write('%04d %04d\n' % (j, i,)) 40 | f.close() 41 | 42 | sort.merge_files(filenames, OUTFILE, max_merge=4) 43 | 44 | for (i, line) in enumerate(open(OUTFILE)): 45 | assert line == '%04d %04d\n' % (i // NUMFILES, i % NUMFILES,) 46 | 47 | print 'OK' 48 | 49 | -------------------------------------------------------------------------------- /test-data/main-cvsrepos/cvs2svn-multiproject.options: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | 3 | # As a partial check that the example options file is functional, we 4 | # use it as the basis for this test. We only need to overwrite the 5 | # output option to get the output repository in the location expected 6 | # by the test infrastructure. 7 | 8 | import os 9 | 10 | execfile('cvs2svn-example.options') 11 | 12 | ctx.output_option = NewRepositoryOutputOption( 13 | 'cvs2svn-tmp/main--options=cvs2svn-multiproject.options-svnrepos', 14 | ) 15 | 16 | ctx.cross_project_commits = False 17 | ctx.cross_branch_commits = False 18 | 19 | run_options.clear_projects() 20 | 21 | for project in [ 22 | 'full-prune', 23 | 'full-prune-reappear', 24 | 'interleaved', 25 | 'partial-prune', 26 | 'proj', 27 | 'single-files', 28 | ]: 29 | run_options.add_project( 30 | os.path.join(r'test-data/main-cvsrepos', project), 31 | trunk_path='%s/trunk' % (project,), 32 | branches_path='%s/branches' % (project,), 33 | tags_path='%s/tags' % (project,), 34 | initial_directories=['%s/releases' % (project,)], 35 | symbol_strategy_rules=global_symbol_strategy_rules, 36 | ) 37 | 38 | -------------------------------------------------------------------------------- /test-data/issue-100-cvsrepos/file1.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendor:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2004.11.28.11.21.29; author ianr; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.02.04.22.27.56; author ianr; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.02.04.22.27.56; author ianr; state Exp; 22 | branches; 23 | next 1.1.1.2; 24 | 25 | 1.1.1.2 26 | date 2004.10.11.02.26.01; author ianr; state Exp; 27 | branches; 28 | next 1.1.1.3; 29 | 30 | 1.1.1.3 31 | date 2003.02.04.22.27.56; author ianr; state Exp; 32 | branches; 33 | next ; 34 | 35 | 36 | desc 37 | @@ 38 | 39 | 40 | 1.2 41 | log 42 | @duplicated log message 43 | @ 44 | text 45 | @file1.txt<1.2> 46 | @ 47 | 48 | 49 | 1.1 50 | log 51 | @Initial revision 52 | @ 53 | text 54 | @d1 1 55 | a1 1 56 | file1.txt<1.1> 57 | @ 58 | 59 | 60 | 1.1.1.1 61 | log 62 | @import 1 63 | @ 64 | text 65 | @d1 1 66 | a1 1 67 | file1.txt<1.1.1.1> 68 | @ 69 | 70 | 71 | 1.1.1.2 72 | log 73 | @import 2 74 | @ 75 | text 76 | @d1 1 77 | a1 1 78 | file1.txt<1.1.1.2> 79 | @ 80 | 81 | 82 | 1.1.1.3 83 | log 84 | @revert 85 | @ 86 | text 87 | @d1 1 88 | a1 1 89 | file1.txt<1.1.1.3> 90 | @ 91 | 92 | 93 | -------------------------------------------------------------------------------- /test-data/issue-100-cvsrepos/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | vendor:1.1.1; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.2 10 | date 2005.02.17.01.59.23; author ianr; state Exp; 11 | branches; 12 | next 1.1; 13 | 14 | 1.1 15 | date 2003.02.04.22.27.56; author ianr; state Exp; 16 | branches 17 | 1.1.1.1; 18 | next ; 19 | 20 | 1.1.1.1 21 | date 2003.02.04.22.27.56; author ianr; state Exp; 22 | branches; 23 | next 1.1.1.2; 24 | 25 | 1.1.1.2 26 | date 2004.11.28.11.21.29; author ianr; state Exp; 27 | branches; 28 | next 1.1.1.3; 29 | 30 | 1.1.1.3 31 | date 2003.02.04.22.27.56; author ianr; state Exp; 32 | branches; 33 | next 1.1.1.4; 34 | 35 | 1.1.1.4 36 | date 2005.02.28.05.08.33; author ianr; state Exp; 37 | branches; 38 | next ; 39 | 40 | 41 | desc 42 | @@ 43 | 44 | 45 | 1.2 46 | log 47 | @log 1 48 | @ 49 | text 50 | @@ 51 | 52 | 53 | 1.1 54 | log 55 | @Initial revision 56 | @ 57 | text 58 | @@ 59 | 60 | 61 | 1.1.1.1 62 | log 63 | @import 1 64 | @ 65 | text 66 | @@ 67 | 68 | 69 | 1.1.1.2 70 | log 71 | @duplicated log message 72 | @ 73 | text 74 | @@ 75 | 76 | 77 | 1.1.1.3 78 | log 79 | @revert 80 | @ 81 | text 82 | @@ 83 | 84 | 85 | 1.1.1.4 86 | log 87 | @duplicated log message 88 | @ 89 | text 90 | @@ 91 | 92 | 93 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/thread/BUILDING,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | libshout-2_0:1.1.1.1 6 | libshout-2_0b3:1.1.1.1 7 | libshout-2_0b2:1.1.1.1 8 | libshout_2_0b1:1.1.1.1 9 | libogg2-zerocopy:1.1.1.1.0.4 10 | branch-beta2-rewrite:1.1.1.1.0.2 11 | start:1.1.1.1 12 | xiph:1.1.1; 13 | locks; strict; 14 | comment @# @; 15 | 16 | 17 | 1.1 18 | date 2001.09.10.02.26.33; author jack; state Exp; 19 | branches 20 | 1.1.1.1; 21 | next ; 22 | 23 | 1.1.1.1 24 | date 2001.09.10.02.26.33; author jack; state Exp; 25 | branches; 26 | next ; 27 | 28 | 29 | desc 30 | @@ 31 | 32 | 33 | 34 | 1.1 35 | log 36 | @Initial revision 37 | @ 38 | text 39 | @defines that affect compilation 40 | 41 | _WIN32 42 | this should be defined for Win32 platforms 43 | 44 | DEBUG_MUTEXES 45 | define this to turn on mutex debugging. this will log locks/unlocks. 46 | 47 | CHECK_MUTEXES (DEBUG_MUTEXES must also be defined) 48 | checks to make sure mutex operations make sense. ie, multi_mutex is locked 49 | when locking multiple mutexes, etc. 50 | 51 | THREAD_DEBUG (define to 1-4) 52 | turns on the thread.log logging 53 | 54 | 55 | 56 | 57 | 58 | 59 | @ 60 | 61 | 62 | 1.1.1.1 63 | log 64 | @move to cvs 65 | @ 66 | text 67 | @@ 68 | -------------------------------------------------------------------------------- /Dockerfile: -------------------------------------------------------------------------------- 1 | # cvs2svn has some dependencies that are no longer widely available 2 | # (e.g., Python 2.x and an oldish version of the Subversion library). 3 | # This Dockerfile builds images that can be used to run or test 4 | # cvs2svn. Note that it is based on debian:jessie, which is pretty 5 | # old. But this is the most recent version of Debian where the 6 | # required dependencies are easily available. One way to use this is 7 | # to run 8 | # 9 | # make docker-image 10 | # 11 | # to make an image for running cvs2svn, or 12 | # 13 | # make docker-test 14 | # 15 | # to make an image for testing cvs2svn and to run those tests using 16 | # the image. 17 | 18 | FROM debian:jessie AS run 19 | 20 | RUN apt-get update && \ 21 | apt-get install -y \ 22 | python \ 23 | python-bsddb3 \ 24 | subversion \ 25 | rcs \ 26 | cvs 27 | 28 | RUN mkdir /src 29 | WORKDIR /src 30 | COPY . . 31 | RUN ${PYTHON} ./setup.py install 32 | 33 | # The CVS repository can be mounted here: 34 | VOLUME ["/cvs"] 35 | 36 | # A volume for storing temporary files can be mounted here: 37 | VOLUME ["/tmp"] 38 | 39 | ENTRYPOINT ["cvs2svn"] 40 | 41 | FROM run AS test 42 | 43 | RUN ln -s /tmp cvs2svn-tmp 44 | 45 | ENTRYPOINT ["./run-tests.py"] 46 | -------------------------------------------------------------------------------- /.mailmap: -------------------------------------------------------------------------------- 1 | # cvs2svn was developed on tigris.org for most of its lifetime. When 2 | # it was converted to Git, the email addresses didn't get converted to 3 | # anything meaningful. This file contains a mapping from the 4 | # autogenerated email addresses to the contributor's preferred email 5 | # addresses. 6 | 7 | C. Michael Pilato 8 | Greg Stein 9 | Branko Čibej 10 | Blair Zajac 11 | Max Bowsher 12 | Brian W. Fitzpatrick 13 | Tobias Ringström 14 | Karl Fogel 15 | Erik Hülsmann 16 | David Summers 17 | Michael Haggerty 18 | Oswald Buddenhagen 19 | -------------------------------------------------------------------------------- /test-data/resync-misgroups-cvsrepos/README: -------------------------------------------------------------------------------- 1 | This data is for testing the resolution of: 2 | 3 | http://subversion.tigris.org/issues/show_bug.cgi?id=1427 4 | "cvs2svn: fails on GtkRadiant repository" 5 | 6 | But the data here is not the GtkRadiant data. Instead, it comes from 7 | Jack Moffitt at xiph.org, who was able to narrow down the same bug to 8 | a much smaller repro set. It might be possible to narrow it down even 9 | further, I don't know -- too lazy to try right now. The important 10 | thing is that this data won't convert if revision 6567 is subtracted 11 | from cvs2svn.py. The error message can look either like this 12 | 13 | ----- pass 3 ----- 14 | ----- pass 4 ----- 15 | committing: Sun Sep 9 21:26:32 2001, over 3 seconds 16 | No origin records for branch 'xiph'. 17 | 18 | or like this 19 | 20 | File "./cvs2svn.py", line 960, in copy_path 21 | entries) 22 | File "./cvs2svn.py", line 661, in change_path 23 | for ent in new_val.keys(): 24 | AttributeError: 'None' object has no attribute 'keys' 25 | 26 | the former if no part of the 'xiph' vendor import branch has been 27 | created in the Subversion repository by the time we get to the problem 28 | file, the latter if /branches/xiph/ already exists. It could go 29 | either way, depending on how Python iterates over dictionary keys. 30 | -------------------------------------------------------------------------------- /test-data/invalid-closings-on-trunk-cvsrepos/proj/trunk-changed-later.txt,v: -------------------------------------------------------------------------------- 1 | head 1.2; 2 | access; 3 | symbols 4 | TAG-ALL-FILES:1.1 5 | vtag-1:1.1.1.1 6 | vbranchA:1.1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.2 12 | date 2004.02.19.15.43.13; author fitz; state Exp; 13 | branches; 14 | next 1.1; 15 | 16 | 1.1 17 | date 2004.02.09.15.43.13; author kfogel; state Exp; 18 | branches 19 | 1.1.1.1; 20 | next ; 21 | 22 | 1.1.1.1 23 | date 2004.02.09.15.43.13; author kfogel; state Exp; 24 | branches; 25 | next 1.1.1.2; 26 | 27 | 1.1.1.2 28 | date 2004.02.09.15.43.13; author kfogel; state Exp; 29 | branches; 30 | next ; 31 | 32 | 33 | desc 34 | @@ 35 | 36 | 37 | 1.2 38 | log 39 | @Commit to trunk-changed-later.txt later in its life 40 | @ 41 | text 42 | @This is a change to trunk-changed-later.txt intended to generate 43 | multiple closings (since it was on a default branch prior to this 44 | commit). 45 | @ 46 | 47 | 48 | 1.1 49 | log 50 | @Initial revision 51 | @ 52 | text 53 | @d1 3 54 | a3 1 55 | This is vtag-1 (on vbranchA) of trunk-changed-later.txt. 56 | @ 57 | 58 | 59 | 1.1.1.1 60 | log 61 | @Import (vbranchA, vtag-1). 62 | @ 63 | text 64 | @@ 65 | 66 | 67 | 1.1.1.2 68 | log 69 | @Import (vbranchA, vtag-3). 70 | @ 71 | text 72 | @d1 1 73 | a1 1 74 | This is vtag-3 (on vbranchA) of trunk-changed-later.txt. 75 | @ 76 | 77 | 78 | -------------------------------------------------------------------------------- /test-data/peer-path-pruning-cvsrepos/one.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | BRANCH:1.2.0.2 5 | vendortag:1.1.1.1 6 | vendorbranch:1.1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.3 12 | date 2004.06.07.18.42.06; author kfogel; state Exp; 13 | branches; 14 | next 1.2; 15 | 16 | 1.2 17 | date 2004.06.07.18.38.34; author kfogel; state Exp; 18 | branches 19 | 1.2.2.1; 20 | next 1.1; 21 | 22 | 1.1 23 | date 2003.05.24.01.02.01; author kfogel; state Exp; 24 | branches 25 | 1.1.1.1; 26 | next ; 27 | 28 | 1.1.1.1 29 | date 2003.05.24.01.02.01; author kfogel; state Exp; 30 | branches; 31 | next ; 32 | 33 | 1.2.2.1 34 | date 2004.06.07.20.29.58; author kfogel; state Exp; 35 | branches; 36 | next ; 37 | 38 | 39 | desc 40 | @@ 41 | 42 | 43 | 1.3 44 | log 45 | @Commit 1.3 of every file. 46 | @ 47 | text 48 | @Another small change. 49 | @ 50 | 51 | 52 | 1.2 53 | log 54 | @Commit 1.2 of every file. 55 | @ 56 | text 57 | @d1 1 58 | a1 1 59 | A small change. 60 | @ 61 | 62 | 63 | 1.2.2.1 64 | log 65 | @Commit change to everyone on branch BRANCH_1. 66 | @ 67 | text 68 | @d1 1 69 | a1 1 70 | First change on branch BRANCH_1 (1.2.2.1). 71 | @ 72 | 73 | 74 | 1.1 75 | log 76 | @Initial revision 77 | @ 78 | text 79 | @d1 1 80 | a1 1 81 | This is the first revision. 82 | @ 83 | 84 | 85 | 1.1.1.1 86 | log 87 | @Initial import. 88 | @ 89 | text 90 | @@ 91 | -------------------------------------------------------------------------------- /test-data/peer-path-pruning-cvsrepos/two.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | BRANCH:1.2.0.2 5 | vendortag:1.1.1.1 6 | vendorbranch:1.1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.3 12 | date 2004.06.07.18.42.06; author kfogel; state Exp; 13 | branches; 14 | next 1.2; 15 | 16 | 1.2 17 | date 2004.06.07.18.38.34; author kfogel; state Exp; 18 | branches 19 | 1.2.2.1; 20 | next 1.1; 21 | 22 | 1.1 23 | date 2003.05.24.01.02.01; author kfogel; state Exp; 24 | branches 25 | 1.1.1.1; 26 | next ; 27 | 28 | 1.1.1.1 29 | date 2003.05.24.01.02.01; author kfogel; state Exp; 30 | branches; 31 | next ; 32 | 33 | 1.2.2.1 34 | date 2004.06.07.20.29.58; author kfogel; state Exp; 35 | branches; 36 | next ; 37 | 38 | 39 | desc 40 | @@ 41 | 42 | 43 | 1.3 44 | log 45 | @Commit 1.3 of every file. 46 | @ 47 | text 48 | @Another small change. 49 | @ 50 | 51 | 52 | 1.2 53 | log 54 | @Commit 1.2 of every file. 55 | @ 56 | text 57 | @d1 1 58 | a1 1 59 | A small change. 60 | @ 61 | 62 | 63 | 1.2.2.1 64 | log 65 | @Commit change to everyone on branch BRANCH_1. 66 | @ 67 | text 68 | @d1 1 69 | a1 1 70 | First change on branch BRANCH_1 (1.2.2.1). 71 | @ 72 | 73 | 74 | 1.1 75 | log 76 | @Initial revision 77 | @ 78 | text 79 | @d1 1 80 | a1 1 81 | This is the first revision. 82 | @ 83 | 84 | 85 | 1.1.1.1 86 | log 87 | @Initial import. 88 | @ 89 | text 90 | @@ 91 | -------------------------------------------------------------------------------- /cvs2svn_lib/key_generator.py: -------------------------------------------------------------------------------- 1 | # (Be in -*- python -*- mode.) 2 | # 3 | # ==================================================================== 4 | # Copyright (c) 2000-2008 CollabNet. All rights reserved. 5 | # 6 | # This software is licensed as described in the file COPYING, which 7 | # you should have received as part of this distribution. 8 | # 9 | # This software consists of voluntary contributions made by many 10 | # individuals. For exact contribution history, see the revision 11 | # history and logs. 12 | # ==================================================================== 13 | 14 | """This module contains the KeyGenerator class.""" 15 | 16 | 17 | class KeyGenerator: 18 | """Generate a series of unique keys.""" 19 | 20 | def __init__(self, first_id=1): 21 | """Initialize a KeyGenerator with the specified FIRST_ID. 22 | 23 | FIRST_ID should be an int or long, and the generated keys will be 24 | of the same type.""" 25 | 26 | self._key_base = first_id 27 | self._last_id = None 28 | 29 | def gen_id(self): 30 | """Generate and return a previously-unused key, as an integer.""" 31 | 32 | self._last_id = self._key_base 33 | self._key_base += 1 34 | 35 | return self._last_id 36 | 37 | def get_last_id(self): 38 | """Return the last id that was generated, as an integer.""" 39 | 40 | return self._last_id 41 | 42 | 43 | -------------------------------------------------------------------------------- /test-data/peer-path-pruning-cvsrepos/foo/four.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | BRANCH:1.3.0.2 5 | vendortag:1.1.1.1 6 | vendorbranch:1.1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.3 12 | date 2004.06.07.18.42.06; author kfogel; state Exp; 13 | branches 14 | 1.3.2.1; 15 | next 1.2; 16 | 17 | 1.2 18 | date 2004.06.07.18.38.34; author kfogel; state Exp; 19 | branches; 20 | next 1.1; 21 | 22 | 1.1 23 | date 2003.05.24.01.02.01; author kfogel; state Exp; 24 | branches 25 | 1.1.1.1; 26 | next ; 27 | 28 | 1.1.1.1 29 | date 2003.05.24.01.02.01; author kfogel; state Exp; 30 | branches; 31 | next ; 32 | 33 | 1.3.2.1 34 | date 2004.06.07.20.29.58; author kfogel; state Exp; 35 | branches; 36 | next ; 37 | 38 | 39 | desc 40 | @@ 41 | 42 | 43 | 1.3 44 | log 45 | @Commit 1.3 of every file. 46 | @ 47 | text 48 | @Another small change. 49 | @ 50 | 51 | 52 | 1.3.2.1 53 | log 54 | @Commit change to everyone on branch BRANCH_1. 55 | @ 56 | text 57 | @d1 1 58 | a1 1 59 | First change on branch BRANCH_1 (1.3.2.1). 60 | @ 61 | 62 | 63 | 1.2 64 | log 65 | @Commit 1.2 of every file. 66 | @ 67 | text 68 | @d1 1 69 | a1 1 70 | A small change. 71 | @ 72 | 73 | 74 | 1.1 75 | log 76 | @Initial revision 77 | @ 78 | text 79 | @d1 1 80 | a1 1 81 | This is the first revision. 82 | @ 83 | 84 | 85 | 1.1.1.1 86 | log 87 | @Initial import. 88 | @ 89 | text 90 | @@ 91 | -------------------------------------------------------------------------------- /test-data/peer-path-pruning-cvsrepos/foo/three.txt,v: -------------------------------------------------------------------------------- 1 | head 1.3; 2 | access; 3 | symbols 4 | BRANCH:1.3.0.2 5 | vendortag:1.1.1.1 6 | vendorbranch:1.1.1; 7 | locks; strict; 8 | comment @# @; 9 | 10 | 11 | 1.3 12 | date 2004.06.07.18.42.06; author kfogel; state Exp; 13 | branches 14 | 1.3.2.1; 15 | next 1.2; 16 | 17 | 1.2 18 | date 2004.06.07.18.38.34; author kfogel; state Exp; 19 | branches; 20 | next 1.1; 21 | 22 | 1.1 23 | date 2003.05.24.01.02.01; author kfogel; state Exp; 24 | branches 25 | 1.1.1.1; 26 | next ; 27 | 28 | 1.1.1.1 29 | date 2003.05.24.01.02.01; author kfogel; state Exp; 30 | branches; 31 | next ; 32 | 33 | 1.3.2.1 34 | date 2004.06.07.20.29.58; author kfogel; state Exp; 35 | branches; 36 | next ; 37 | 38 | 39 | desc 40 | @@ 41 | 42 | 43 | 1.3 44 | log 45 | @Commit 1.3 of every file. 46 | @ 47 | text 48 | @Another small change. 49 | @ 50 | 51 | 52 | 1.3.2.1 53 | log 54 | @Commit change to everyone on branch BRANCH_1. 55 | @ 56 | text 57 | @d1 1 58 | a1 1 59 | First change on branch BRANCH_1 (1.3.2.1). 60 | @ 61 | 62 | 63 | 1.2 64 | log 65 | @Commit 1.2 of every file. 66 | @ 67 | text 68 | @d1 1 69 | a1 1 70 | A small change. 71 | @ 72 | 73 | 74 | 1.1 75 | log 76 | @Initial revision 77 | @ 78 | text 79 | @d1 1 80 | a1 1 81 | This is the first revision. 82 | @ 83 | 84 | 85 | 1.1.1.1 86 | log 87 | @Initial import. 88 | @ 89 | text 90 | @@ 91 | -------------------------------------------------------------------------------- /test-data/bogus-branch-copy-cvsrepos/file2.txt,v: -------------------------------------------------------------------------------- 1 | head 1.4; 2 | access; 3 | symbols 4 | branch-boom:1.3.0.2; 5 | locks; strict; 6 | comment @# @; 7 | 8 | 9 | 1.4 10 | date 2005.07.21.15.31.18; author harry; state Exp; 11 | branches; 12 | next 1.3; 13 | 14 | 1.3 15 | date 2005.04.01.20.47.29; author harry; state Exp; 16 | branches 17 | 1.3.2.1; 18 | next 1.2; 19 | 20 | 1.2 21 | date 2005.03.29.23.11.45; author harry; state Exp; 22 | branches; 23 | next 1.1; 24 | 25 | 1.1 26 | date 2005.03.23.23.20.09; author sally; state dead; 27 | branches; 28 | next ; 29 | 30 | 1.3.2.1 31 | date 2005.04.01.20.47.29; author harry; state dead; 32 | branches; 33 | next 1.3.2.2; 34 | 35 | 1.3.2.2 36 | date 2005.04.01.23.13.40; author harry; state Exp; 37 | branches; 38 | next ; 39 | 40 | 41 | desc 42 | @@ 43 | 44 | 45 | 1.4 46 | log 47 | @merged sally to trunk 48 | @ 49 | text 50 | @@ 51 | 52 | 53 | 1.3 54 | log 55 | @merged sally to trunk 56 | @ 57 | text 58 | @@ 59 | 60 | 61 | 1.3.2.1 62 | log 63 | @file file2.txt was added on branch branch-boom on 2005-04-01 23:13:40 +0000 64 | @ 65 | text 66 | @@ 67 | 68 | 69 | 1.3.2.2 70 | log 71 | @merged trunk to ira 72 | @ 73 | text 74 | @@ 75 | 76 | 77 | 1.2 78 | log 79 | @merged sally to trunk 80 | @ 81 | text 82 | @@ 83 | 84 | 85 | 1.1 86 | log 87 | @file file2.txt.py was initially added on branch branch-sally. 88 | @ 89 | text 90 | @@ 91 | 92 | 93 | -------------------------------------------------------------------------------- /test-data/default-branches-cvsrepos/proj/e.txt,v: -------------------------------------------------------------------------------- 1 | head 1.1; 2 | branch 1.1.1; 3 | access; 4 | symbols 5 | vtag-3:1.1.1.3; 6 | locks; strict; 7 | comment @# @; 8 | 9 | 10 | 1.1 11 | date 2004.02.09.15.43.13; author kfogel; state Exp; 12 | branches 13 | 1.1.1.1; 14 | next ; 15 | 16 | 1.1.1.1 17 | date 2004.02.09.15.43.13; author kfogel; state Exp; 18 | branches; 19 | next 1.1.1.2; 20 | 21 | 1.1.1.2 22 | date 2004.02.09.15.43.13; author kfogel; state Exp; 23 | branches; 24 | next 1.1.1.3; 25 | 26 | 1.1.1.3 27 | date 2004.02.09.15.43.13; author kfogel; state Exp; 28 | branches; 29 | next 1.1.1.4; 30 | 31 | 1.1.1.4 32 | date 2004.02.09.15.43.16; author kfogel; state Exp; 33 | branches; 34 | next ; 35 | 36 | 37 | desc 38 | @@ 39 | 40 | 41 | 1.1 42 | log 43 | @Initial revision 44 | @ 45 | text 46 | @This is vtag-1 (on vbranchA) of e.txt. 47 | @ 48 | 49 | 50 | 1.1.1.1 51 | log 52 | @Import (vbranchA, vtag-1). 53 | @ 54 | text 55 | @@ 56 | 57 | 58 | 1.1.1.2 59 | log 60 | @Import (vbranchA, vtag-2). 61 | @ 62 | text 63 | @d1 1 64 | a1 1 65 | This is vtag-2 (on vbranchA) of e.txt. 66 | @ 67 | 68 | 69 | 1.1.1.3 70 | log 71 | @Import (vbranchA, vtag-3). 72 | @ 73 | text 74 | @d1 1 75 | a1 1 76 | This is vtag-3 (on vbranchA) of e.txt. 77 | @ 78 | 79 | 80 | 1.1.1.4 81 | log 82 | @Import (vbranchA, vtag-4). 83 | @ 84 | text 85 | @d1 1 86 | a1 1 87 | This is vtag-4 (on vbranchA) of e.txt. 88 | @ 89 | 90 | 91 | -------------------------------------------------------------------------------- /test-data/tagged-branch-n-trunk-cvsrepos/b.txt,v: -------------------------------------------------------------------------------- 1 | head 1.6; 2 | access ; 3 | symbols 4 | some-branch:1.5.0.22 5 | some-tag:1.5 ; 6 | locks ; strict; 7 | comment @# @; 8 | 9 | 10 | 1.6 11 | date 2002.10.11.14.28.44; author Mats; state Dev; 12 | branches ; 13 | next 1.5; 14 | 15 | 1.5 16 | date 2000.03.31.14.48.32; author mats; state Dev; 17 | branches ; 18 | next 1.4; 19 | 20 | 1.4 21 | date 2000.03.08.20.59.57; author mats; state Dev; 22 | branches ; 23 | next 1.3; 24 | 25 | 1.3 26 | date 2000.03.06.17.27.00; author mats; state Dev; 27 | branches ; 28 | next 1.2; 29 | 30 | 1.2 31 | date 2000.03.02.13.11.20; author mats; state Dev; 32 | branches ; 33 | next 1.1; 34 | 35 | 1.1 36 | date 2000.03.02.08.39.24; author mats; state Dev; 37 | branches ; 38 | next ; 39 | 40 | 41 | desc 42 | @@ 43 | 44 | 45 | 1.6 46 | log 47 | @log@ 48 | text 49 | @ 1.6 50 | @ 51 | 52 | 53 | 1.5 54 | log 55 | @log@ 56 | text 57 | @d1 1 58 | a1 1 59 | 1.5 60 | @ 61 | 62 | 63 | 1.4 64 | log 65 | @log@ 66 | text 67 | @d1 1 68 | a1 1 69 | 1.4 70 | @ 71 | 72 | 73 | 1.3 74 | log 75 | @ @ 76 | text 77 | @d1 1 78 | a1 1 79 | 1.3 80 | @ 81 | 82 | 83 | 1.2 84 | log 85 | @log@ 86 | text 87 | @d1 1 88 | a1 1 89 | 1.2 90 | @ 91 | 92 | 93 | 1.1 94 | log 95 | @Initial Revision@ 96 | text 97 | @d1 1 98 | a1 1 99 | 1.1 100 | @ 101 | --------------------------------------------------------------------------------