# # # add_file "tests/t_checkout_heads.at" # content [21bd7dcfd193a282363b8180d01c7b128e40027d] # # patch "ChangeLog" # from [9b4400ebe847b1376699f79518653c36ea45e4bf] # to [910ae967d85f592940c6b94d0d6d4ba5d4efcfd4] # # patch "testsuite.at" # from [07cd5c6b7aff77da8753bb746de704a496d3cb57] # to [5a691540cb55e123044af53bb5da58de2862d5be] # ============================================================ --- tests/t_checkout_heads.at 21bd7dcfd193a282363b8180d01c7b128e40027d +++ tests/t_checkout_heads.at 21bd7dcfd193a282363b8180d01c7b128e40027d @@ -0,0 +1,26 @@ +AT_SETUP([checkout fails with multiple heads]) + +MTN_SETUP + +ADD_FILE(testfile, [foo +]) +COMMIT(testbranch) +REV1=`BASE_REVISION` + +ADD_FILE(file2, [bar +]) +COMMIT(testbranch) +REV2=`BASE_REVISION` + +AT_CHECK(MTN update -r $REV1, [], [ignore], [ignore]) +ADD_FILE(otherfile, [splork +]) +COMMIT(testbranch) +REV3=`BASE_REVISION` + +AT_CHECK(MTN --branch=testbranch checkout test_dir1, + [1], [ignore], [stderr]) +AT_CHECK(grep $REV2 stderr, [0], [ignore], [ignore]) +AT_CHECK(grep $REV3 stderr, [0], [ignore], [ignore]) + +AT_CLEANUP ============================================================ --- ChangeLog 9b4400ebe847b1376699f79518653c36ea45e4bf +++ ChangeLog 910ae967d85f592940c6b94d0d6d4ba5d4efcfd4 @@ -1,5 +1,11 @@ 2006-04-20 Timtohy Brownawell + * tests/t_checkout_heads.at: New file: checkout should fail if there + are multiple heads. + * testsuite.at: Add it. + +2006-04-20 Timtohy Brownawell + * testsuite.at: NOT_ON_WIN32 seems to be broken. Fix it. 2006-04-19 Timtohy Brownawell ============================================================ --- testsuite.at 07cd5c6b7aff77da8753bb746de704a496d3cb57 +++ testsuite.at 5a691540cb55e123044af53bb5da58de2862d5be @@ -878,3 +878,4 @@ m4_include(tests/t_setup_workspace_in_workspace.at) m4_include(tests/t_help.at) m4_include(tests/t_approve.at) +m4_include(tests/t_checkout_heads.at)