# # # delete "tests/common/cvs.lua" # # add_dir "tests/cvs_import_with_file_added_on_a_branch/cvs-repository" # # add_dir "tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test" # # add_dir "tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/Attic" # # add_dir "tests/importing_a_cvs_file_with_one_version/cvs-repository" # # add_dir "tests/importing_a_cvs_file_with_one_version/cvs-repository/test" # # add_dir "tests/importing_cvs_branches_with_correct_ancestory/cvs-repository" # # add_dir "tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test" # # add_dir "tests/importing_cvs_files/cvs-repository" # # add_dir "tests/importing_cvs_files/cvs-repository/test" # # add_dir "tests/importing_cvs_files_with_identical_logs/cvs-repository" # # add_dir "tests/importing_cvs_files_with_identical_logs/cvs-repository/test" # # add_dir "tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository" # # add_dir "tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test" # # add_file "tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/Attic/bar,v" # content [25a727a677505783a794ea8f3673bb84bffd7ab3] # # add_file "tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/foo,v" # content [3e7c5851618812ef8ced3c08798e29ec7361802b] # # add_file "tests/cvs_import_with_file_added_on_a_branch/makerepo.sh" # content [65279f67f08b4755449cb63a7371a198459375b3] # # add_file "tests/importing_a_cvs_file_with_one_version/cvs-repository/test/foo,v" # content [9c3a9131aceaa7297989eeb02db80b528c8ae7d7] # # add_file "tests/importing_a_cvs_file_with_one_version/makerepo.sh" # content [e3d12446e93f0700b9baa7427984a1eb0517e003] # # add_file "tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/changelog,v" # content [a3066de0597d10a6d59b7bfc9c5f3e0e185092a3] # # add_file "tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/file1,v" # content [69ea95a8ba64a08289384f644ee16e744a31f6ff] # # add_file "tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/file2,v" # content [fc5079092bb91825674088aeee408baea81ca031] # # add_file "tests/importing_cvs_branches_with_correct_ancestory/makerepo.sh" # content [f019931e59b9f41f06550ab434eb349a2e2a9e70] # # add_file "tests/importing_cvs_files/cvs-repository/test/foo,v" # content [2839380cb7f2352f90da2312209d3461e453d4bd] # # add_file "tests/importing_cvs_files/makerepo.sh" # content [8876f40a20551d29d06f909eb941316ba83861b1] # # add_file "tests/importing_cvs_files_with_identical_logs/cvs-repository/test/foo,v" # content [8ec65a037122351bfd97da26815b2e4240079dbb] # # add_file "tests/importing_cvs_files_with_identical_logs/makerepo.sh" # content [ea1910481eda82366d08d195472c67391511fdce] # # add_file "tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/changelog,v" # content [b0102cf2d2cac667e3330ca749941bdd66892ab2] # # add_file "tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file1,v" # content [d06d46b2598b25993f472ef7a5449ece4b2d24e9] # # add_file "tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file2,v" # content [01112316495c5dcf0876a8e77239860dc457cf5f] # # add_file "tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh" # content [097069758ff87222ea260f7568626b9fdb916f9e] # # patch "tests/cvs_import_with_file_added_on_a_branch/__driver__.lua" # from [ada42479e819222ba0659a2e5d5876b1a9f89263] # to [d0e6597708af820827e6b7337fdfd5f3783f3b8f] # # patch "tests/importing_a_cvs_file_with_one_version/__driver__.lua" # from [1f1c361267d06b929bc431416d2d99f9385c8e9c] # to [0de6fa65f177b1e770e82c70a42e5d9ddf844a20] # # patch "tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua" # from [fa31cd63b45c828bf4a6461a13d661571e6bca2a] # to [d631fce5fc35c3cbc4f0fcd8fa2967f1747063fe] # # patch "tests/importing_cvs_files/__driver__.lua" # from [0170dbd22fc9bc14c8a6d16d6f85754d5a4dabf1] # to [0312cfcedd5ac67a6eba6580b93f4526eb955efd] # # patch "tests/importing_cvs_files_with_identical_logs/__driver__.lua" # from [3cb0ee23b2ff8bf5307f24086e520efe5b931d7f] # to [c96c35bf4d237bb60787fa0b5ca2bcb32a40fc8e] # # patch "tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua" # from [a9bbce79a2f24f68156023636326bc1825b78146] # to [336b66cb2d6203748dfc1f1acb85346354288d9c] # # set "tests/cvs_import_with_file_added_on_a_branch/makerepo.sh" # attr "mtn:execute" # value "true" # # set "tests/importing_a_cvs_file_with_one_version/makerepo.sh" # attr "mtn:execute" # value "true" # # set "tests/importing_cvs_branches_with_correct_ancestory/makerepo.sh" # attr "mtn:execute" # value "true" # # set "tests/importing_cvs_files/makerepo.sh" # attr "mtn:execute" # value "true" # # set "tests/importing_cvs_files_with_identical_logs/makerepo.sh" # attr "mtn:execute" # value "true" # # set "tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh" # attr "mtn:execute" # value "true" # ============================================================ --- tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/Attic/bar,v 25a727a677505783a794ea8f3673bb84bffd7ab3 +++ tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/Attic/bar,v 25a727a677505783a794ea8f3673bb84bffd7ab3 @@ -0,0 +1,43 @@ +head 1.1; +access; +symbols + branch:1.1.0.2; +locks; strict; +comment @# @; + + +1.1 +date 2007.02.27.19.30.19; author markus; state dead; +branches + 1.1.2.1; +next ; +commitid Wdel5yc2L7LQfa8s; + +1.1.2.1 +date 2007.02.27.19.30.19; author markus; state Exp; +branches; +next ; +commitid Wdel5yc2L7LQfa8s; + + +desc +@@ + + +1.1 +log address@hidden bar was initially added on branch branch. +@ +text +@@ + + +1.1.2.1 +log address@hidden bar +@ +text address@hidden 1 +bar +@ + ============================================================ --- tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/foo,v 3e7c5851618812ef8ced3c08798e29ec7361802b +++ tests/cvs_import_with_file_added_on_a_branch/cvs-repository/test/foo,v 3e7c5851618812ef8ced3c08798e29ec7361802b @@ -0,0 +1,45 @@ +head 1.1; +branch 1.1.1; +access; +symbols + branch:1.1.1.1.0.2 + rtag:1.1.1.1 + vtag:1.1.1; +locks; strict; +comment @# @; + + +1.1 +date 2007.02.27.19.30.18; author markus; state Exp; +branches + 1.1.1.1; +next ; +commitid A7Ju4GgVezsQfa8s; + +1.1.1.1 +date 2007.02.27.19.30.18; author markus; state Exp; +branches; +next ; +commitid A7Ju4GgVezsQfa8s; + + +desc +@@ + + + +1.1 +log address@hidden revision +@ +text address@hidden +@ + + +1.1.1.1 +log address@hidden +@ +text +@@ ============================================================ --- tests/cvs_import_with_file_added_on_a_branch/makerepo.sh 65279f67f08b4755449cb63a7371a198459375b3 +++ tests/cvs_import_with_file_added_on_a_branch/makerepo.sh 65279f67f08b4755449cb63a7371a198459375b3 @@ -0,0 +1,34 @@ +#!/bin/sh + +CVSROOT=`pwd`/cvs-repository +export CVSROOT + +# deleting the existing cvs-repository +rm -vrf $CVSROOT + +# initializing a new repository +cvs init + +# create an initial module 'test' with one file 'foo' +mkdir test +cd test +echo "foo" > foo +cvs import -m "import" test vtag rtag +cd .. +rm -rf test + +# create a branch 'branch' +cvs co test +cd test +cvs tag -b branch +cvs update -r branch + +# then add a file 'bar' +echo "bar" > bar +cvs add bar +cvs commit -m "add bar" +cd .. +rm -rf test + +# clean up the CVS repository bookkeeping dir +rm -rf cvs-repository/CVSROOT ============================================================ --- tests/importing_a_cvs_file_with_one_version/cvs-repository/test/foo,v 9c3a9131aceaa7297989eeb02db80b528c8ae7d7 +++ tests/importing_a_cvs_file_with_one_version/cvs-repository/test/foo,v 9c3a9131aceaa7297989eeb02db80b528c8ae7d7 @@ -0,0 +1,25 @@ +head 1.1; +access; +symbols; +locks; strict; +comment @# @; + + +1.1 +date 2007.02.27.20.45.00; author markus; state Exp; +branches; +next ; +commitid A4By316YPyhtFa8s; + + +desc +@@ + + +1.1 +log address@hidden 0 +@ +text address@hidden 0 of test file foo +@ ============================================================ --- tests/importing_a_cvs_file_with_one_version/makerepo.sh e3d12446e93f0700b9baa7427984a1eb0517e003 +++ tests/importing_a_cvs_file_with_one_version/makerepo.sh e3d12446e93f0700b9baa7427984a1eb0517e003 @@ -0,0 +1,25 @@ +#!/bin/sh + +CVSROOT=`pwd`/cvs-repository +export CVSROOT + +# deleting the existing cvs-repository +rm -vrf $CVSROOT + +# initializing a new repository +cvs init + +# add a file 'foo' +mkdir full_checkout +cd full_checkout +cvs co . +mkdir test +echo "version 0 of test file foo" > test/foo +cvs add test +cvs add test/foo +cvs commit -m "commit 0" test/foo +cd .. +rm -rf full_checkout + +# clean up the CVS repository bookkeeping dir +rm -rf cvs-repository/CVSROOT ============================================================ --- tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/changelog,v a3066de0597d10a6d59b7bfc9c5f3e0e185092a3 +++ tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/changelog,v a3066de0597d10a6d59b7bfc9c5f3e0e185092a3 @@ -0,0 +1,76 @@ +head 1.3; +access; +symbols + branched:1.2.0.2; +locks; strict; +comment @# @; + + +1.3 +date 2007.02.27.21.10.08; author markus; state Exp; +branches; +next 1.2; +commitid 8rDwYDcpG9T5Oa8s; + +1.2 +date 2007.02.27.21.10.05; author markus; state Exp; +branches + 1.2.2.1; +next 1.1; +commitid hPYcyYzdgsx4Oa8s; + +1.1 +date 2007.02.27.21.10.04; author markus; state Exp; +branches; +next ; +commitid QPchEs2ZzRb4Oa8s; + +1.2.2.1 +date 2007.02.27.21.10.06; author markus; state Exp; +branches; +next ; +commitid xzFImDTBmyb5Oa8s; + + +desc +@@ + + +1.3 +log address@hidden on mainline after branch +@ +text address@hidden changelog entry +second changelog +third changelog -not on branch- +@ + + +1.2 +log address@hidden commit +@ +text address@hidden 1 +@ + + +1.2.2.1 +log address@hidden on branch +@ +text address@hidden 1 +third changelog -on branch- +@ + + +1.1 +log address@hidden import +@ +text address@hidden 1 +@ + ============================================================ --- tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/file1,v 69ea95a8ba64a08289384f644ee16e744a31f6ff +++ tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/file1,v 69ea95a8ba64a08289384f644ee16e744a31f6ff @@ -0,0 +1,61 @@ +head 1.3; +access; +symbols + branched:1.2.0.2; +locks; strict; +comment @# @; + + +1.3 +date 2007.02.27.21.10.08; author markus; state Exp; +branches; +next 1.2; +commitid 8rDwYDcpG9T5Oa8s; + +1.2 +date 2007.02.27.21.10.05; author markus; state Exp; +branches; +next 1.1; +commitid hPYcyYzdgsx4Oa8s; + +1.1 +date 2007.02.27.21.10.04; author markus; state Exp; +branches; +next ; +commitid QPchEs2ZzRb4Oa8s; + + +desc +@@ + + +1.3 +log address@hidden on mainline after branch +@ +text address@hidden 2 of test file1 +@ + + +1.2 +log address@hidden commit +@ +text address@hidden 1 +a1 1 +version 1 of test file1 +@ + + +1.1 +log address@hidden import +@ +text address@hidden 1 +a1 1 +version 0 of test file1 +@ + ============================================================ --- tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/file2,v fc5079092bb91825674088aeee408baea81ca031 +++ tests/importing_cvs_branches_with_correct_ancestory/cvs-repository/test/file2,v fc5079092bb91825674088aeee408baea81ca031 @@ -0,0 +1,45 @@ +head 1.1; +access; +symbols + branched:1.1.0.2; +locks; strict; +comment @# @; + + +1.1 +date 2007.02.27.21.10.04; author markus; state Exp; +branches + 1.1.2.1; +next ; +commitid QPchEs2ZzRb4Oa8s; + +1.1.2.1 +date 2007.02.27.21.10.06; author markus; state Exp; +branches; +next ; +commitid xzFImDTBmyb5Oa8s; + + +desc +@@ + + +1.1 +log address@hidden import +@ +text address@hidden 0 of test file2 +@ + + +1.1.2.1 +log address@hidden on branch +@ +text address@hidden 1 +a1 1 +version 1 of test file2 +@ + ============================================================ --- tests/importing_cvs_branches_with_correct_ancestory/makerepo.sh f019931e59b9f41f06550ab434eb349a2e2a9e70 +++ tests/importing_cvs_branches_with_correct_ancestory/makerepo.sh f019931e59b9f41f06550ab434eb349a2e2a9e70 @@ -0,0 +1,54 @@ +#!/bin/sh + +CVSROOT=`pwd`/cvs-repository +export CVSROOT + +# deleting the existing cvs-repository +rm -vrf $CVSROOT + +# initializing a new repository +cvs init + +# do a full checkout of the repository +mkdir full_checkout +cd full_checkout +cvs co . +mkdir test +cvs add test + +cd test + +# an initial import +echo "version 0 of test file1" > file1 +echo "version 0 of test file2" > file2 +echo "first changelog entry" > changelog +cvs add file1 file2 changelog +cvs commit -m "initial import" file1 file2 changelog + +# commit first changes +echo "version 1 of test file1" > file1 +echo "second changelog" >> changelog +cvs commit -m "first commit" file1 changelog + +# now we create a branch +cvs tag -b branched +cvs update -r branched + +# alter the files on the branch +echo "version 1 of test file2" > file2 +echo "third changelog -on branch-" >> changelog +cvs commit -m "commit on branch" file2 changelog + +# switch to the HEAD branch +cvs update -A + +# do a commit on the HEAD +echo "version 2 of test file1" > file1 +echo "third changelog -not on branch-" >> changelog +cvs commit -m "commit on mainline after branch" file1 changelog + +cd ../.. +rm -rf full_checkout + +# clean up the CVS repository bookkeeping dir +rm -rf cvs-repository/CVSROOT ============================================================ --- tests/importing_cvs_files/cvs-repository/test/foo,v 2839380cb7f2352f90da2312209d3461e453d4bd +++ tests/importing_cvs_files/cvs-repository/test/foo,v 2839380cb7f2352f90da2312209d3461e453d4bd @@ -0,0 +1,77 @@ +head 1.4; +access; +symbols; +locks; strict; +comment @# @; + + +1.4 +date 2007.02.27.20.56.07; author markus; state Exp; +branches; +next 1.3; +commitid IfLVNWqiXFLhJa8s; + +1.3 +date 2007.02.27.20.56.06; author markus; state Exp; +branches; +next 1.2; +commitid CtanCPNehnbhJa8s; + +1.2 +date 2007.02.27.20.56.05; author markus; state Exp; +branches; +next 1.1; +commitid IkocdHkrmeSgJa8s; + +1.1 +date 2007.02.27.20.56.04; author markus; state Exp; +branches; +next ; +commitid aPp3YlZMS1pgJa8s; + + +desc +@@ + + +1.4 +log address@hidden 3 +@ +text address@hidden 3 of test file foo +@ + + +1.3 +log address@hidden 2 +@ +text address@hidden 1 +a1 1 +version 2 of test file foo +@ + + +1.2 +log address@hidden 1 +@ +text address@hidden 1 +a1 1 +version 1 of test file foo +@ + + +1.1 +log address@hidden 0 +@ +text address@hidden 1 +a1 1 +version 0 of test file foo +@ + ============================================================ --- tests/importing_cvs_files/makerepo.sh 8876f40a20551d29d06f909eb941316ba83861b1 +++ tests/importing_cvs_files/makerepo.sh 8876f40a20551d29d06f909eb941316ba83861b1 @@ -0,0 +1,37 @@ +#!/bin/sh + +CVSROOT=`pwd`/cvs-repository +export CVSROOT + +# deleting the existing cvs-repository +rm -vrf $CVSROOT + +# initializing a new repository +cvs init + +# do a full checkout of the repository +mkdir full_checkout +cd full_checkout +cvs co . +mkdir test +cvs add test + +# do some commits on file foo +echo "version 0 of test file foo" > test/foo +cvs add test/foo +cvs commit -m "commit 0" test/foo + +echo "version 1 of test file foo" > test/foo +cvs commit -m "commit 1" test/foo + +echo "version 2 of test file foo" > test/foo +cvs commit -m "commit 2" test/foo + +echo "version 3 of test file foo" > test/foo +cvs commit -m "commit 3" test/foo + +cd .. +rm -rf full_checkout + +# clean up the CVS repository bookkeeping dir +rm -rf cvs-repository/CVSROOT ============================================================ --- tests/importing_cvs_files_with_identical_logs/cvs-repository/test/foo,v 8ec65a037122351bfd97da26815b2e4240079dbb +++ tests/importing_cvs_files_with_identical_logs/cvs-repository/test/foo,v 8ec65a037122351bfd97da26815b2e4240079dbb @@ -0,0 +1,77 @@ +head 1.4; +access; +symbols; +locks; strict; +comment @# @; + + +1.4 +date 2007.02.27.20.59.43; author markus; state Exp; +branches; +next 1.3; +commitid g0pLcIHkR7kwKa8s; + +1.3 +date 2007.02.27.20.59.42; author markus; state Exp; +branches; +next 1.2; +commitid olJIxuqYWnQvKa8s; + +1.2 +date 2007.02.27.20.59.41; author markus; state Exp; +branches; +next 1.1; +commitid ptIiB8DZrAlvKa8s; + +1.1 +date 2007.02.27.20.59.40; author markus; state Exp; +branches; +next ; +commitid cJmh51MqNZ6vKa8s; + + +desc +@@ + + +1.4 +log address@hidden 3 +@ +text address@hidden 3 of test file foo +@ + + +1.3 +log address@hidden same message +@ +text address@hidden 1 +a1 1 +version 2 of test file foo +@ + + +1.2 +log address@hidden same message +@ +text address@hidden 1 +a1 1 +version 1 of test file foo +@ + + +1.1 +log address@hidden 0 +@ +text address@hidden 1 +a1 1 +version 0 of test file foo +@ + ============================================================ --- tests/importing_cvs_files_with_identical_logs/makerepo.sh ea1910481eda82366d08d195472c67391511fdce +++ tests/importing_cvs_files_with_identical_logs/makerepo.sh ea1910481eda82366d08d195472c67391511fdce @@ -0,0 +1,37 @@ +#!/bin/sh + +CVSROOT=`pwd`/cvs-repository +export CVSROOT + +# deleting the existing cvs-repository +rm -vrf $CVSROOT + +# initializing a new repository +cvs init + +# do a full checkout of the repository +mkdir full_checkout +cd full_checkout +cvs co . +mkdir test +cvs add test + +# do some commits on file foo +echo "version 0 of test file foo" > test/foo +cvs add test/foo +cvs commit -m "commit 0" test/foo + +echo "version 1 of test file foo" > test/foo +cvs commit -m "commit same message" test/foo + +echo "version 2 of test file foo" > test/foo +cvs commit -m "commit same message" test/foo + +echo "version 3 of test file foo" > test/foo +cvs commit -m "commit 3" test/foo + +cd .. +rm -rf full_checkout + +# clean up the CVS repository bookkeeping dir +rm -rf cvs-repository/CVSROOT ============================================================ --- tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/changelog,v b0102cf2d2cac667e3330ca749941bdd66892ab2 +++ tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/changelog,v b0102cf2d2cac667e3330ca749941bdd66892ab2 @@ -0,0 +1,92 @@ +head 1.3; +access; +symbols + branched:1.2.0.2 + VENDOR_REL_1:1.1.1.1 + VENDOR:1.1.1; +locks; strict; +comment @# @; + + +1.3 +date 2007.03.08.08.10.28; author markus; state Exp; +branches; +next 1.2; +commitid dc8wvvzdtRwGcg9s; + +1.2 +date 2007.03.08.08.10.25; author markus; state Exp; +branches + 1.2.2.1; +next 1.1; +commitid JXqf58BweBoFcg9s; + +1.1 +date 2007.03.08.08.10.24; author markus; state Exp; +branches + 1.1.1.1; +next ; +commitid J1BbsCUAYvXEcg9s; + +1.2.2.1 +date 2007.03.08.08.10.26; author markus; state Exp; +branches; +next ; +commitid s3jspLSQWmNFcg9s; + +1.1.1.1 +date 2007.03.08.08.10.24; author markus; state Exp; +branches; +next ; +commitid J1BbsCUAYvXEcg9s; + + +desc +@@ + + +1.3 +log address@hidden on mainline after branch +@ +text address@hidden changelog entry +second changelog +third changelog -not on branch- +@ + + +1.2 +log address@hidden 0 +@ +text address@hidden 1 +@ + + +1.2.2.1 +log address@hidden on branch +@ +text address@hidden 1 +third changelog -on branch- +@ + + +1.1 +log address@hidden revision +@ +text address@hidden 1 +@ + + +1.1.1.1 +log address@hidden import of VENDORWARE 1 +@ +text +@@ ============================================================ --- tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file1,v d06d46b2598b25993f472ef7a5449ece4b2d24e9 +++ tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file1,v d06d46b2598b25993f472ef7a5449ece4b2d24e9 @@ -0,0 +1,78 @@ +head 1.2; +access; +symbols + branched:1.2.0.2 + VENDOR_REL_1:1.1.1.1 + VENDOR:1.1.1; +locks; strict; +comment @# @; + + +1.2 +date 2007.03.08.08.10.25; author markus; state Exp; +branches + 1.2.2.1; +next 1.1; +commitid JXqf58BweBoFcg9s; + +1.1 +date 2007.03.08.08.10.24; author markus; state Exp; +branches + 1.1.1.1; +next ; +commitid J1BbsCUAYvXEcg9s; + +1.2.2.1 +date 2007.03.08.08.10.26; author markus; state Exp; +branches; +next ; +commitid s3jspLSQWmNFcg9s; + +1.1.1.1 +date 2007.03.08.08.10.24; author markus; state Exp; +branches; +next ; +commitid J1BbsCUAYvXEcg9s; + + +desc +@@ + + +1.2 +log address@hidden 0 +@ +text address@hidden 1 of test file1 +@ + + +1.2.2.1 +log address@hidden on branch +@ +text address@hidden 1 +a1 1 +version 2 of test file1 +@ + + +1.1 +log address@hidden revision +@ +text address@hidden 1 +a1 1 +version 0 of test file1 +@ + + +1.1.1.1 +log address@hidden import of VENDORWARE 1 +@ +text +@@ ============================================================ --- tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file2,v 01112316495c5dcf0876a8e77239860dc457cf5f +++ tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file2,v 01112316495c5dcf0876a8e77239860dc457cf5f @@ -0,0 +1,63 @@ +head 1.1; +branch 1.1.1; +access; +symbols + branched:1.1.1.1.0.2 + VENDOR_REL_1:1.1.1.1 + VENDOR:1.1.1; +locks; strict; +comment @# @; + + +1.1 +date 2007.03.08.08.10.24; author markus; state Exp; +branches + 1.1.1.1; +next ; +commitid J1BbsCUAYvXEcg9s; + +1.1.1.1 +date 2007.03.08.08.10.24; author markus; state Exp; +branches + 1.1.1.1.2.1; +next ; +commitid J1BbsCUAYvXEcg9s; + +1.1.1.1.2.1 +date 2007.03.08.08.10.26; author markus; state Exp; +branches; +next ; +commitid s3jspLSQWmNFcg9s; + + +desc +@@ + + +1.1 +log address@hidden revision +@ +text address@hidden 0 of test file2 +@ + + +1.1.1.1 +log address@hidden import of VENDORWARE 1 +@ +text +@@ + + +1.1.1.1.2.1 +log address@hidden on branch +@ +text address@hidden 1 +a1 1 +version 1 of test file2 +@ + ============================================================ --- tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh 097069758ff87222ea260f7568626b9fdb916f9e +++ tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh 097069758ff87222ea260f7568626b9fdb916f9e @@ -0,0 +1,46 @@ +#!/bin/sh + +CVSROOT=`pwd`/cvs-repository +export CVSROOT + +# deleting the existing cvs-repository +rm -vrf $CVSROOT + +# initializing a new repository +cvs init + +# create the initial 3rd-party vendor import +mkdir test +cd test +echo "version 0 of test file1" > file1 +echo "version 0 of test file2" > file2 +echo "first changelog entry" > changelog +cvs import -m "Initial import of VENDORWARE 1" test VENDOR VENDOR_REL_1 +cd .. +rm -rf test + +# now we alter some of the files +cvs checkout test +cd test +echo "version 1 of test file1" > file1 +echo "second changelog" >> changelog +cvs commit -m "commit 0" + +# now we create a branch +cvs tag -b branched +cvs update -r branched + +# alter the files on the branch +echo "version 2 of test file1" > file1 +echo "version 1 of test file2" > file2 +echo "third changelog -on branch-" >> changelog +cvs commit -m "commit on branch" + +# and create some mainline changes after the branch +cvs update -A +echo "third changelog -not on branch-" >> changelog +cvs commit -m "commit on mainline after branch" + +# cleanup the working directory and the CVS repository bookkeeping dir +cd .. +rm -rf test cvs-repository/CVSROOT ============================================================ --- tests/cvs_import_with_file_added_on_a_branch/__driver__.lua ada42479e819222ba0659a2e5d5876b1a9f89263 +++ tests/cvs_import_with_file_added_on_a_branch/__driver__.lua d0e6597708af820827e6b7337fdfd5f3783f3b8f @@ -1,23 +1,12 @@ -include("/common/cvs.lua") mtn_setup() -cvs_setup() +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) + -- This tests the case where a file was added on a branch in CVS; CVS -- records this in a strange way (with a delete of the non-existent -- file on mainline, followed by an add of the file on the branch). -- Make sure we handle it correct. +check(mtn("--branch=test", "cvs_import", "cvs-repository"), 0, false, false) -mkdir("src") -writefile("src/foo", "foo") -check(indir("src", cvs("import", "-m", "import", "mod", "vtag", "rtag")), 0, false, false) -remove("src") -mkdir("src") -check(indir("src", cvs("co", "mod")), 0, false, false) -check(indir("src/mod", cvs("tag", "-b", "branch")), 0, false, false) -check(indir("src/mod", cvs("up", "-r", "branch")), 0, false, false) -writefile("src/mod/bar", "bar") -check(indir("src/mod", cvs("add", "bar")), 0, false, false) -check(indir("src/mod", cvs("ci", "-m", "add bar")), 0, false, false) - -check(mtn("--branch=test", "cvs_import", cvsroot.."/mod"), 0, false, false) ============================================================ --- tests/importing_a_cvs_file_with_one_version/__driver__.lua 1f1c361267d06b929bc431416d2d99f9385c8e9c +++ tests/importing_a_cvs_file_with_one_version/__driver__.lua 0de6fa65f177b1e770e82c70a42e5d9ddf844a20 @@ -1,25 +1,12 @@ -include("/common/cvs.lua") mtn_setup() -writefile("importme.0", "version 0 of test file") +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) -tsha = sha1("importme.0") --- build the cvs repository +writefile("foo", "version 0 of test file foo\n") +tsha = sha1("foo") -cvs_setup() - --- check out the workspace and make a commit - -check(cvs("co", "."), 0, false, false) -mkdir("testdir") -rename("importme.0", "testdir/importme") -check(cvs("add", "testdir"), 0, false, false) -check(cvs("add", "testdir/importme"), 0, false, false) -check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false) - --- import into monotone and check presence of file - -check(mtn("--branch=testbranch", "cvs_import", cvsroot .. "/testdir"), 0, false, false) +check(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 0, false, false) check(mtn("automate", "get_file", tsha), 0, false) ============================================================ --- tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua fa31cd63b45c828bf4a6461a13d661571e6bca2a +++ tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua d631fce5fc35c3cbc4f0fcd8fa2967f1747063fe @@ -1,68 +1,34 @@ -include("common/cvs.lua") mtn_setup() -writefile("file1.0", "version 0 of test file1") -writefile("file1.1", "version 1 of test file1") -writefile("file1.2", "version 2 of test file1") -writefile("file2.0", "version 0 of test file2") -writefile("file2.1", "version 1 of test file2") -writefile("changelog.0", "first changelog entry\n") +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) -writefile("changelog.1", "second changelog\n\n"..readfile("changelog.0")) -writefile("changelog.2", "third changelog -not on branch-\n\n"..readfile("changelog.1")) -writefile("changelog.3", "third changelog -on branch-\n\n"..readfile("changelog.1")) +writefile("file1.0", "version 0 of test file1\n") +writefile("file1.1", "version 1 of test file1\n") +writefile("file1.2", "version 2 of test file1\n") +writefile("file2.0", "version 0 of test file2\n") +writefile("file2.1", "version 1 of test file2\n") +writefile("changelog.0", "first changelog entry\n") +writefile("changelog.1", readfile("changelog.0").."second changelog\n") +writefile("changelog.2", readfile("changelog.1").."third changelog -not on branch-\n") +writefile("changelog.3", readfile("changelog.1").."third changelog -on branch-\n") + F1SHA0=sha1("file1.0") F1SHA1=sha1("file1.1") F1SHA2=sha1("file1.2") F2SHA0=sha1("file2.0") -T2SHA1=sha1("file2.1") +F2SHA1=sha1("file2.1") CSHA0=sha1("changelog.0") CSHA1=sha1("changelog.1") CSHA2=sha1("changelog.2") CSHA3=sha1("changelog.3") --- build the cvs repository -cvs_setup() - --- checkout the empty repository and commit some files - -check(cvs("co", "."), 0, false, false) -mkdir("testdir") -writefile("testdir/file1", readfile("file1.0")) -writefile("testdir/file2", readfile("file2.0")) -writefile("testdir/changelog", readfile("changelog.0")) -check(cvs("add", "testdir"), 0, false, false) -check(cvs("add", "testdir/file1"), 0, false, false) -check(cvs("add", "testdir/file2"), 0, false, false) -check(cvs("add", "testdir/changelog"), 0, false, false) -check(cvs("commit", "-m", 'initial import', "testdir/file1", "testdir/file2", "testdir/changelog"), 0, false, false) - --- commit first changes -writefile("testdir/file1", readfile("file1.1")) -writefile("testdir/changelog", readfile("changelog.1")) -check(cvs("commit", "-m", 'first commit', "testdir/file1", "testdir/changelog"), 0, false, false) - --- now we create a branch -check(indir("testdir", cvs("tag", "-b", "branched")), 0, false, false) -check(indir("testdir", cvs("up", "-r", "branched")), 0, false, false) - --- alter the files on the branch -writefile("testdir/file2", readfile("file2.1")) -writefile("testdir/changelog", readfile("changelog.3")) -check(cvs("commit", "-m", 'commit on branch', "testdir/file2", "testdir/changelog"), 0, false, false) - --- and create some mainline changes after the branch -check(cvs("up", "-A"), 0, false, false) -writefile("testdir/file1", readfile("file1.2")) -writefile("testdir/changelog", readfile("changelog.2")) -check(cvs("commit", "-m", 'commit on mainline after branch', "testdir/file1", "testdir/changelog"), 0, false, false) - -- import into monotone and check presence of files -check(mtn("--branch=test", "cvs_import", cvsroot.."/testdir"), 0, false, false) +check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false) -- check if all branches were imported check(mtn("list", "branches"), 0, true, false) ============================================================ --- tests/importing_cvs_files/__driver__.lua 0170dbd22fc9bc14c8a6d16d6f85754d5a4dabf1 +++ tests/importing_cvs_files/__driver__.lua 0312cfcedd5ac67a6eba6580b93f4526eb955efd @@ -1,41 +1,26 @@ -include("/common/cvs.lua") mtn_setup() -writefile("importme.3", "version 3 of test file") +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) +writefile("foo.0", "version 0 of test file foo\n") +writefile("foo.1", "version 1 of test file foo\n") +writefile("foo.2", "version 2 of test file foo\n") +writefile("foo.3", "version 3 of test file foo\n") +tsha0 = sha1("foo.0") +tsha1 = sha1("foo.1") +tsha2 = sha1("foo.2") +tsha3 = sha1("foo.3") --- build the cvs repository +-- safety check -- we stop people from accidentally feeding their whole +-- repo to cvs_import instead of just a module. For that, we re-add the +-- CVSROOT bookkeeping directory +mkdir("cvs-repository/CVSROOT") +check(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 1, false, false) -cvs_setup() - --- check out the workspace and make some commits --- note that this has to use copy, rather than rename, to update --- the file in cvs. Apparently, cvs uses timestamps or something to track --- file modifications. -check(cvs("co", "."), 0, false, false) -mkdir("testdir") -writefile("testdir/importme", "version 0 of test file") -tsha0 = sha1("testdir/importme") -check(cvs("add", "testdir"), 0, false, false) -check(cvs("add", "testdir/importme"), 0, false, false) -check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false) -writefile("testdir/importme", "version 1 of test file") -tsha1 = sha1("testdir/importme") -check(cvs("commit", "-m", 'commit 1', "testdir/importme"), 0, false, false) -writefile("testdir/importme", "version 2 of test file") -tsha2 = sha1("testdir/importme") -check(cvs("commit", "-m", 'commit 2', "testdir/importme"), 0, false, false) -writefile("testdir/importme", "version 3 of test file") -tsha3 = sha1("testdir/importme") -check(cvs("commit", "-m", 'commit 3', "testdir/importme"), 0, false, false) - -- import into monotone and check presence of files - --- safety check -- we stop people from accidentally feeding their whole --- repo to cvs_import instead of just a module. -check(mtn("--branch=testbranch", "cvs_import", cvsroot), 1, false, false) -check(mtn("--branch=testbranch", "cvs_import", cvsroot .. "/testdir"), 0, false, false) +check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false) check(mtn("automate", "get_file", tsha0), 0, false) check(mtn("automate", "get_file", tsha1), 0, false) check(mtn("automate", "get_file", tsha2), 0, false) @@ -43,6 +28,5 @@ check(mtn("automate", "get_file", tsha3) -- also check that history is okay -- has a unique head, and it's the -- right one. - check(mtn("checkout", "--branch=testbranch", "mtcodir"), 0, false, false) +check(samefile("foo.3", "mtcodir/foo")) -check(samefile("importme.3", "mtcodir/importme")) ============================================================ --- tests/importing_cvs_files_with_identical_logs/__driver__.lua 3cb0ee23b2ff8bf5307f24086e520efe5b931d7f +++ tests/importing_cvs_files_with_identical_logs/__driver__.lua c96c35bf4d237bb60787fa0b5ca2bcb32a40fc8e @@ -1,35 +1,20 @@ -include("/common/cvs.lua") mtn_setup() -writefile("importme.3", "version 3 of test file") +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) --- build the cvs repository +writefile("foo.0", "version 0 of test file foo\n") +writefile("foo.1", "version 1 of test file foo\n") +writefile("foo.2", "version 2 of test file foo\n") +writefile("foo.3", "version 3 of test file foo\n") +tsha0 = sha1("foo.0") +tsha1 = sha1("foo.1") +tsha2 = sha1("foo.2") +tsha3 = sha1("foo.3") -cvs_setup() - --- check out the workspace and make some commits - -check(cvs("co", "."), 0, false, false) -mkdir("testdir") -writefile("testdir/importme", "version 0 of test file") -tsha0 = sha1("testdir/importme") -check(cvs("add", "testdir"), 0, false, false) -check(cvs("add", "testdir/importme"), 0, false, false) -check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false) -writefile("testdir/importme", "version 1 of test file") -tsha1 = sha1("testdir/importme") -check(cvs("commit", "-m", 'commit same message', "testdir/importme"), 0, false, false) -writefile("testdir/importme", "version 2 of test file") -tsha2 = sha1("testdir/importme") -check(cvs("commit", "-m", 'commit same message', "testdir/importme"), 0, false, false) -writefile("testdir/importme", "version 3 of test file") -tsha3 = sha1("testdir/importme") -check(cvs("commit", "-m", 'commit 3', "testdir/importme"), 0, false, false) - -- import into monotone and check presence of files - -check(mtn("--branch=testbranch", "cvs_import", cvsroot.."/testdir"), 0, false, false) +check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false) check(mtn("automate", "get_file", tsha0), 0, false) check(mtn("automate", "get_file", tsha1), 0, false) check(mtn("automate", "get_file", tsha2), 0, false) @@ -37,6 +22,5 @@ check(mtn("automate", "get_file", tsha3) -- also check that history is okay -- has a unique head, and it's the -- right one. - check(mtn("checkout", "--branch=testbranch", "mtcodir"), 0, false, false) +check(samefile("foo.3", "mtcodir/foo")) -check(samefile("importme.3", "mtcodir/importme")) ============================================================ --- tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua a9bbce79a2f24f68156023636326bc1825b78146 +++ tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua 336b66cb2d6203748dfc1f1acb85346354288d9c @@ -1,56 +1,24 @@ -include("/common/cvs.lua") mtn_setup() -cvs_setup() --- create the initial 3rd-party vendor import -mkdir("importdir") -writefile("file1.0", "version 0 of test file1") -copy("file1.0", "importdir/file1") -writefile("file2.0", "version 0 of test file2") -copy("file2.0", "importdir/file2") -writefile("changelog.0", "first changelog entry\n") -copy("changelog.0", "importdir/changelog") -check(indir("importdir", cvs("import", "-m", "Initial import of VENDORWARE 1", "testsrc", "VENDOR", "VENDOR_REL_1")), 0, false, false) +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) --- now we alter some of the files. -check(cvs("co", "testsrc"), 0, false, false) -writefile("file1.1", "version 1 of test file1") -copy("file1.1", "testsrc/file1") -check(cat("-", "changelog.0"), 0, true, false, "second changelog\n\n") -rename("stdout", "changelog.1") -copy("changelog.1", "testsrc/changelog") -check(indir("testsrc", cvs ("commit", "-m", 'commit 0')), 0, false, false) +writefile("file1.1", "version 1 of test file1\n") +writefile("file1.2", "version 2 of test file1\n") +writefile("file2.0", "version 0 of test file2\n") +writefile("file2.1", "version 1 of test file2\n") -check(cat("-", "changelog.1"), 0, true, false, "third changelog -not on branch-\n\n") -rename("stdout", "changelog.2") --- now we create a branch -check(indir("testsrc", cvs ("tag", "-b", "branched")), 0, false, false) -check(indir("testsrc", cvs ("up", "-r", "branched")), 0, false, false) +writefile("changelog.0", "first changelog entry\n") +writefile("changelog.1", readfile("changelog.0").."second changelog\n") +writefile("changelog.2", readfile("changelog.1").."third changelog -not on branch-\n") +writefile("changelog.3", readfile("changelog.1").."third changelog -on branch-\n") --- alter the files on the branch -writefile("file1.2", "version 2 of test file1") -copy("file1.2", "testsrc/file1") -writefile("file2.1", "version 1 of test file2") -copy("file2.1", "testsrc/file2") -check(cat("-", "changelog.1"), 0, true, false, "third changelog -on branch-\n\n") -rename("stdout", "changelog.3") -copy("changelog.3", "testsrc/changelog") -check(indir("testsrc", cvs ("commit", "-m", 'commit on branch')), 0, false, false) --- and create some mainline changes after the branch -check(indir("testsrc", cvs ("up", "-A")), 0, false, false) -copy("changelog.2", "testsrc/changelog") -check(indir("testsrc", cvs ("commit", "-m", 'commit on mainline after branch')), 0, false, false) - -- import into monotone and check presence of files +check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false) -check(mtn("--branch=test", "cvs_import", cvsroot.."/testsrc"), 0, false, false) - --- also check that checkout is correct --- right one. - check(mtn("checkout", "--branch=test", "maindir"), 0, false, false) check(mtn("checkout", "--branch=test.branched", "branchdir"), 0, false, false)