# # # patch "tests/t_cvspull_combined.at" # from [296e598ed0643c57d8ca64579158382061db9752] # to [05bc0f0677888d5f79a924ee190e63ce2ae2cc8e] # # patch "tests/t_cvspull_committemplate.at" # from [dd9814a5f607acc515b78c8d5f3c79a55e28b121] # to [f190773b21ddc2941fa923202fe86b47fb406d86] # # patch "tests/t_cvspull_cvsbranch.at" # from [f1a3b5a55047f026a496940e4b5a5d8a413f1409] # to [7b16f2374c77131e6103275df13f2f554ab226a2] # # patch "tests/t_cvspull_md5fail.at" # from [53805d3d30902063c5f0f56a0ca0496cff5926fd] # to [02a5549e9bf91d657a7e164be43cda40bb3cb372] # # patch "tests/t_cvspull_rapid.at" # from [23d6dbd406236bf3ed58f4d184df0ddbd4a57164] # to [63fb6aa9b825dbb1eebbaac30e2985a1213996d7] # # patch "tests/t_cvspull_samedirname.at" # from [aa218a0b428644a49b80fe44eaab458d9b6b5a65] # to [81c59a31a85aad74350feee75e00b87fe623ab56] # # patch "tests/t_cvspull_separate.at" # from [66e963f2f180affea97698fd9d3b779172392c94] # to [1fc70d93bfec85badddbc287537633a292e76fd7] # # patch "tests/t_cvspull_xmodule.at" # from [bb83d36acd905331d26be2f105b0f85a076df537] # to [b8a56bd6aa5de9fbcbf166c7c3ba76b65301dd86] # # patch "tests/t_cvspush_loop.at" # from [f8aa53397d39ce5916033666059c0e44ca4071da] # to [520ecae7515c58d43f0bd012d180b532abb64781] # # patch "tests/t_cvstakeover_modified.at" # from [ff571d103846957b390f35602c7d70b3602eed18] # to [7adacff147559e11a210134bd80aafda307544e0] # ============================================================ --- tests/t_cvspull_combined.at 296e598ed0643c57d8ca64579158382061db9752 +++ tests/t_cvspull_combined.at 05bc0f0677888d5f79a924ee190e63ce2ae2cc8e @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS module with complex history]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(d_import, [initial import ]) @@ -60,21 +60,21 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT test, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull $CVSROOT test, [], [ignore], [ignore]) # check presence of files -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA1, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA2, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA3, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA4, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA1, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA2, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA3, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA4, [], [ignore]) # also check that history is okay -- has a unique head, and it's the # right one. -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) AT_CHECK(cmp d_readd mtcodir/A) AT_CHECK(cmp d_change mtcodir/B) AT_CHECK(cmp d_subdir mtcodir/dir/D) ============================================================ --- tests/t_cvspull_committemplate.at dd9814a5f607acc515b78c8d5f3c79a55e28b121 +++ tests/t_cvspull_committemplate.at f190773b21ddc2941fa923202fe86b47fb406d86 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS module that has a commit template]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(importme.0, [version 0 of test file ]) @@ -59,20 +59,20 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT testdir, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull $CVSROOT testdir, [], [ignore], [ignore]) # check presence of files -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA1, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA2, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA3, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA1, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA2, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA3, [], [ignore]) # also check that history is okay -- has a unique head, and it's the # right one. -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) AT_CHECK(cmp importme.3 mtcodir/importme) AT_CLEANUP ============================================================ --- tests/t_cvspull_cvsbranch.at f1a3b5a55047f026a496940e4b5a5d8a413f1409 +++ tests/t_cvspull_cvsbranch.at 7b16f2374c77131e6103275df13f2f554ab226a2 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS side branch]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(d_import, [initial import ]) @@ -66,20 +66,20 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT test branch, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull $CVSROOT test branch, [], [ignore], [ignore]) # check presence of files -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) -#AT_CHECK(MONOTONE automate get_file $TSHA1, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA2, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA3, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA4, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) +#AT_CHECK(MTN automate get_file $TSHA1, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA2, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA3, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA4, [], [ignore]) # also check that history is okay -- has a unique head, and it's the # right one. -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) AT_CHECK(cmp d_import mtcodir/A2) AT_CHECK(cmp d_readd mtcodir/A) AT_CHECK(cmp d_change mtcodir/B) ============================================================ --- tests/t_cvspull_md5fail.at 53805d3d30902063c5f0f56a0ca0496cff5926fd +++ tests/t_cvspull_md5fail.at 02a5549e9bf91d657a7e164be43cda40bb3cb372 @@ -1,10 +1,10 @@ # -*- Autoconf -*- AT_SETUP([takeover modified, cvs commit, pull (causing MD5 failure)]) AT_KEYWORDS(cvssync) NEED_UNGZB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(d_newcontents, [new contents revived @@ -41,17 +41,17 @@ AT_CHECK([cvs -q -d $CVSROOT co test], [], [ignore], [ignore]) AT_CHECK([cp d_newcontents test/A]) -AT_CHECK(cd test; MONOTONE --root=. --branch=testbranch cvs_takeover test, [], [ignore], [ignore]) +AT_CHECK(cd test; MTN --root=. --branch=testbranch cvs_takeover test, [], [ignore], [ignore]) AT_CHECK([cp d_newcontents2 test/A]) AT_CHECK([cd test; cvs -Q ci -m "put different data into CVS"]) -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [], [ignore], [ignore]) # check for presence of file -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA1, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA1, [], [ignore]) # should do nothing -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_cvspull_rapid.at 23d6dbd406236bf3ed58f4d184df0ddbd4a57164 +++ tests/t_cvspull_rapid.at 63fb6aa9b825dbb1eebbaac30e2985a1213996d7 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS module with rapidly changed history]) -MONOTONE_SETUP +MTN_SETUP # build the cvs repository @@ -38,10 +38,10 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT test, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull $CVSROOT test, [], [ignore], [ignore]) # also check that history is okay -- has a unique head -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_cvspull_samedirname.at aa218a0b428644a49b80fe44eaab458d9b6b5a65 +++ tests/t_cvspull_samedirname.at 81c59a31a85aad74350feee75e00b87fe623ab56 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS module that has a subdirectory with the same name as the module]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(importme.0, [version 0 of test file ]) @@ -54,20 +54,20 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT testdir, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull $CVSROOT testdir, [], [ignore], [ignore]) # check presence of files -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA1, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA2, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA3, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA1, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA2, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA3, [], [ignore]) # also check that history is okay -- has a unique head, and it's the # right one. -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) AT_CHECK(cmp importme.2 mtcodir/importme) AT_CHECK(cmp importme.3 mtcodir/testdir/importme) ============================================================ --- tests/t_cvspull_separate.at 66e963f2f180affea97698fd9d3b779172392c94 +++ tests/t_cvspull_separate.at 1fc70d93bfec85badddbc287537633a292e76fd7 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS module step by step]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(d_import, [initial import ]) @@ -37,7 +37,7 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull "$CVSROOT" test, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull "$CVSROOT" test, [0], [ignore], [ignore]) # change the repository in various ways @@ -46,17 +46,17 @@ AT_CHECK([cd test;cvs -Q add B]) AT_CHECK([sleep 1;cd test;cvs -Q ci -m 'B added']) -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [0], [ignore], [ignore]) AT_CHECK([cd test;cvs -Q delete -f A]) AT_CHECK([cd test;sleep 1;cvs -Q ci -m 'A removed']) -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [0], [ignore], [ignore]) AT_CHECK(cp d_change test/B) AT_CHECK([cd test;sleep 1;cvs -Q ci -m 'B changed']) -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [0], [ignore], [ignore]) AT_CHECK(mkdir test/dir) AT_CHECK([cd test;cvs -Q add dir]) @@ -64,26 +64,26 @@ AT_CHECK([cd test;cvs -Q add dir/D]) AT_CHECK([cd test;sleep 1;cvs -Q ci -m 'dir/D added']) -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [0], [ignore], [ignore]) AT_CHECK(cp d_readd test/A) AT_CHECK([cd test;cvs -Q add A]) AT_CHECK([cd test;sleep 1;cvs -Q ci -m 'A readded']) -AT_CHECK(MONOTONE --branch=testbranch cvs_pull, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull, [0], [ignore], [ignore]) # check presence of files -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA1, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA2, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA3, [], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA4, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA1, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA2, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA3, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA4, [], [ignore]) # also check that history is okay -- has a unique head, and it's the # right one. -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [0], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [0], [ignore], [ignore]) AT_CHECK(cmp d_readd mtcodir/A) AT_CHECK(cmp d_change mtcodir/B) AT_CHECK(cmp d_subdir mtcodir/dir/D) ============================================================ --- tests/t_cvspull_xmodule.at bb83d36acd905331d26be2f105b0f85a076df537 +++ tests/t_cvspull_xmodule.at b8a56bd6aa5de9fbcbf166c7c3ba76b65301dd86 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([pull of CVS module with rapidly changed history]) -MONOTONE_SETUP +MTN_SETUP # build the cvs repository @@ -68,10 +68,10 @@ # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT test, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_pull $CVSROOT test, [], [ignore], [ignore]) # also check that history is okay -- has a unique head -AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch mtcodir, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_cvspush_loop.at f8aa53397d39ce5916033666059c0e44ca4071da +++ tests/t_cvspush_loop.at 520ecae7515c58d43f0bd012d180b532abb64781 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([CVS push with fork and merge]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(d_a, [A ]) @@ -29,23 +29,23 @@ # change the repository in various ways AT_CHECK([cvs -q -d $CVSROOT co test], [], [ignore], [ignore]) -AT_CHECK([cd test;MONOTONE --root . --branch testbranch cvs_takeover test], [0], [ignore], [ignore]) +AT_CHECK([cd test;MTN --root . --branch testbranch cvs_takeover test], [0], [ignore], [ignore]) AT_CHECK([cp -r test test2]) -AT_CHECK([cd test;MONOTONE drop A;MONOTONE ci -m "a dropped"], [0], [ignore], [ignore]) -LEFT=`MONOTONE automate heads` +AT_CHECK([cd test;MTN drop A;MTN ci -m "a dropped"], [0], [ignore], [ignore]) +LEFT=`MTN automate heads` AT_CHECK([cp d_c test2/C]) -AT_CHECK([cd test2;MONOTONE add C;MONOTONE ci -m "c added"], [0], [ignore], [ignore]) +AT_CHECK([cd test2;MTN add C;MTN ci -m "c added"], [0], [ignore], [ignore]) -AT_CHECK(MONOTONE merge, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch testbranch cvs_push, [0], [ignore], [ignore]) +AT_CHECK(MTN merge, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch testbranch cvs_push, [0], [ignore], [ignore]) # no change yet AT_CHECK([test -e $CVSROOT/test/A,v]) AT_CHECK([test ! -e $CVSROOT/test/C,v]) -AT_CHECK(MONOTONE --revision $LEFT --branch testbranch cvs_push, [0], [ignore], [ignore]) +AT_CHECK(MTN --revision $LEFT --branch testbranch cvs_push, [0], [ignore], [ignore]) AT_CHECK([test -e $CVSROOT/test/Attic/A,v]) AT_CHECK([test -e $CVSROOT/test/C,v]) ============================================================ --- tests/t_cvstakeover_modified.at ff571d103846957b390f35602c7d70b3602eed18 +++ tests/t_cvstakeover_modified.at 7adacff147559e11a210134bd80aafda307544e0 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([take over a modified CVS checkout and push changes into CVS]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(d_import, [initial import ]) @@ -41,13 +41,13 @@ AT_CHECK(cp d_change test/B) -AT_CHECK([cd test;MONOTONE --root . --branch testbranch cvs_takeover test], [0], [ignore], [ignore]) +AT_CHECK([cd test;MTN --root . --branch testbranch cvs_takeover test], [0], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch testbranch cvs_push, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch testbranch cvs_push, [0], [ignore], [ignore]) ######## # check presence of files -AT_CHECK(MONOTONE automate get_file $TSHA2, [], [ignore]) +AT_CHECK(MTN automate get_file $TSHA2, [], [ignore]) # also check that CVS sees this newly changed file