# # patch "tests/t_cvsimport3.at" # from [30d8e31d2e4017b5f01aa2df6d5f4b420c65cdbb] # to [3c381dc5ef409da2a3a8585061508b43d67c4f58] # --- tests/t_cvsimport3.at +++ tests/t_cvsimport3.at @@ -1,6 +1,6 @@ # -*- Autoconf -*- -AT_SETUP([importing CVS files with vendor imports and branches]) +AT_SETUP([importing CVS with vendor imports and branches]) MONOTONE_SETUP @@ -22,19 +22,19 @@ AT_DATA(changelog.0, [first changelog entry ]) -AT_DATA(changelog.1 [second changelog +AT_DATA(changelog.1, [second changelog first changelog entry ]) -AT_DATA(changelog.2 [third changelog -not on branch- +AT_DATA(changelog.2, [third changelog -not on branch- second changelog first changelog entry ]) -AT_DATA(changelog.3 [third changelog -on branch- +AT_DATA(changelog.3, [third changelog -on branch- second changelog @@ -90,8 +90,6 @@ # 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. AT_CHECK(MONOTONE --branch=test cvs_import $CVSROOT/testsrc, [], [ignore], [ignore]) # also check that checkout is correct