# # # patch "tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileA,v" # from [d254a43ea85a1d99df57bbfe209f813c0d11362b] # to [529c6ab6da9a409cc188961361b8a7db7b20c60a] # # patch "tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileB,v" # from [6cf1b51748f19e0ecf638d55151ffb87f0fccae7] # to [d747e32416f134b69a3c633e1c889e4a50fb277d] # # patch "tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileC,v" # from [34bd3ac7932954b2f6ccb460eb40c0814a1e849e] # to [cdd92f9bd022f6f0d7ecf53e382f75fa5bc0721b] # # patch "tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh" # from [a0aa700e593e7842a99e02d94faf0f70aa376680] # to [4d7ddf56178a02b11bc437ec62f8432e138847de] # ============================================================ --- tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileA,v d254a43ea85a1d99df57bbfe209f813c0d11362b +++ tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileA,v 529c6ab6da9a409cc188961361b8a7db7b20c60a @@ -10,23 +10,23 @@ 1.1 1.1 -date 2007.03.10.12.46.47; author markus; state Exp; +date 2007.09.14.19.30.33; author markus; state Exp; branches 1.1.1.1; next ; -commitid Ato52FfvuyyuFx9s; +commitid 7VzHVNr2uCmlRJxs; 1.1.1.1 -date 2007.03.10.12.46.47; author markus; state Exp; +date 2007.09.14.19.30.33; author markus; state Exp; branches; next 1.1.1.2; -commitid Ato52FfvuyyuFx9s; +commitid 7VzHVNr2uCmlRJxs; 1.1.1.2 -date 2007.03.10.12.46.48; author markus; state Exp; +date 2007.09.14.19.30.50; author markus; state Exp; branches; next ; -commitid ugLDgLG0IeOuFx9s; +commitid 5XSDTnCugdrrRJxs; desc ============================================================ --- tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileB,v 6cf1b51748f19e0ecf638d55151ffb87f0fccae7 +++ tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileB,v d747e32416f134b69a3c633e1c889e4a50fb277d @@ -10,23 +10,23 @@ 1.1 1.1 -date 2007.03.10.12.46.47; author markus; state Exp; +date 2007.09.14.19.30.38; author markus; state Exp; branches 1.1.1.1; next ; -commitid Nh7wAhqgMMzuFx9s; +commitid lOyLX6YRmj7nRJxs; 1.1.1.1 -date 2007.03.10.12.46.47; author markus; state Exp; +date 2007.09.14.19.30.38; author markus; state Exp; branches; next 1.1.1.2; -commitid Nh7wAhqgMMzuFx9s; +commitid lOyLX6YRmj7nRJxs; 1.1.1.2 -date 2007.03.10.12.46.48; author markus; state Exp; +date 2007.09.14.19.30.55; author markus; state Exp; branches; next ; -commitid I0Bk1uestPUuFx9s; +commitid CnWq4i76Q9YsRJxs; desc ============================================================ --- tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileC,v 34bd3ac7932954b2f6ccb460eb40c0814a1e849e +++ tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileC,v cdd92f9bd022f6f0d7ecf53e382f75fa5bc0721b @@ -6,10 +6,10 @@ 1.1 1.1 -date 2007.03.10.12.46.47; author markus; state Exp; +date 2007.09.14.19.30.44; author markus; state Exp; branches; next ; -commitid 7q60H8GdqhwuFx9s; +commitid EHWq1brTDE5pRJxs; desc ============================================================ --- tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh a0aa700e593e7842a99e02d94faf0f70aa376680 +++ tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh 4d7ddf56178a02b11bc437ec62f8432e138847de @@ -16,6 +16,8 @@ cd .. cvs import -m "Initial import from VendorA" test VendorA VendorA_REL_1 cd .. +sleep 5 + # the second vendor import mkdir vendorB_dir cd vendorB_dir @@ -23,6 +25,8 @@ cd .. cvs import -m "Initial import from VendorB" test VendorB VendorB_REL_1 cd .. +sleep 5 + # checkout the repository and commit some files cvs co test cd test @@ -30,11 +34,15 @@ cvs commit -m "commit 0" cvs add fileC cvs commit -m "commit 0" +sleep 5 + # updates from VendorA cd ../vendorA_dir echo "fileA from VendorA - changed" > fileA cvs import -m "Initial import from VendorA" test VendorA VendorA_REL_2 +sleep 5 + # updates from VendorB cd ../vendorB_dir echo "fileB from VendorB - changed" > fileB