# # # patch "ChangeLog" # from [f5d5baa78bef412900ee8f39c5150b0a2590c9da] # to [cd405cfb4ce677be78ffa5dc7f276c9913b6fc3e] # # patch "tests/t_add_inside_MT.at" # from [d0760c6e2f24d3f968d4d66501ab0a17fdbd5e41] # to [00e567e757fc46c5fad511d711fa5054df6f24c9] # # patch "tests/t_add_intermediate_MT_path.at" # from [2f59bba6a5f0be5473ab14fd45ece15679b49fe0] # to [d51569d27ae7c8ff8045553c5d778f05d9c369b7] # # patch "tests/t_annotate.at" # from [37b6e3a6cf7622fdb94b0dcfe454d1d6044ff02a] # to [1ba28d0a9e3166399d5fa56839655a0f7f03cc0f] # # patch "tests/t_annotate_branch_collision.at" # from [9a98cd3c57767a584b7937a8ab2ddac086139847] # to [844405fcd8b1ba3f12727568688da83e0b67b5c7] # # patch "tests/t_cat_file_by_name.at" # from [a8bd5077ca1e36b9ce1082c3b844603afdfea3ea] # to [ad4272e1a30154bf67970b75cd5bca27b5a20a5a] # # patch "tests/t_checkout_creates_log.at" # from [fc93238f54751248b4477b70b252b3ebfc8708fa] # to [a486e085ecd1ddf55dba3dfd63cc3c056117325c] # # patch "tests/t_checkout_id_sets_branch.at" # from [c175a8f3ae4d59724dce18a21067d11e75390cc7] # to [702d18e6aa83cfaa4ce94e27752c051ef4090c53] # # patch "tests/t_checkout_noop_on_fail.at" # from [4cc60ab6fd6480fbf55db6091c3c8a3a7c3b1e42] # to [93a999e1a23a24adf8b94409af078ed564656aa4] # # patch "tests/t_checkout_options.at" # from [e935f26986b7143bfe07dbee0ecd7a613017d008] # to [24eeba0a23944dc0b0593d1dadfcb4dfc8868166] # # patch "tests/t_commit_cancelled.at" # from [02bcc53fbad3f78b36ab0dbae9b047845b6ad387] # to [6bc3250c034ad7d70100775dbcc56582ce475bbd] # # patch "tests/t_commit_log_1.at" # from [7f484d7237acc02b49235fcbd05fee00fb3ff4e7] # to [d1d63ad1f1c2d3067d11edab3cf3b34c41754a90] # # patch "tests/t_commit_log_2.at" # from [367f752f3e6fe48cdb41a182b9428129d32de8ee] # to [7b2c34e61c1b915006e335baaa65a95c675bd5c3] # # patch "tests/t_commit_log_3.at" # from [2fe89aa0cdb1a484618aa1663551a1017ab85028] # to [0683464b8b1bcfc2c40959accad8d22a17f69691] # # patch "tests/t_commit_log_writeback.at" # from [249e8f82f7c779dbc9de6d0c327ff2494dba91c6] # to [5904bab9a698da393511233261e1d26b6a151fcf] # # patch "tests/t_commit_message_file.at" # from [ff5ee2bfe41e4807ee909ee5319db3d7eff38173] # to [9083f8d8c0f6a978c6421c4f9f352acd2652a95c] # # patch "tests/t_cwork.at" # from [c62e74c66fee35e02b6279e799d3495aafe09377] # to [4c46c95e3ad1871a06fce9c5f94a00fc97930014] # # patch "tests/t_database_check.at" # from [81f66e97321a631d0a5e3e089d1f25dc57d80aa9] # to [78904ea3f51596f3a21b6aea39af1e6621ac7966] # # patch "tests/t_database_check_normalized.at" # from [903b3a090390261102a713b0339e99322d728f16] # to [d89c3d1d57ac11406b965a7d1f7ba69f1bb21381] # # patch "tests/t_db_with_dots.at" # from [69973200a20d087bb2701a5c5e8c927ae54e53d2] # to [b54df6de2ea3fa178dca93aa6003c7273871206d] # # patch "tests/t_diff_outside_workspace.at" # from [91e929a8e18167fc073b033b782d50c04d0dabad] # to [933f39d768ce47a78389a31fd6a05d15dc6f29b8] # # patch "tests/t_epoch_unidirectional.at" # from [8a53bc343a7e48d20843b89a6e77c208de84c38c] # to [f03f544695c15425f879c7534003c29e82634e21] # # patch "tests/t_inodeprints.at" # from [d67a539bc4da605a1959d597bf5747557bc3548f] # to [0a0246b22800058dfde20a03e8998bd18547682c] # # patch "tests/t_inodeprints_hook.at" # from [9ba633b9cd6acf2c4c7630336f4f9755e14a86ef] # to [8dc6552d5c04b58070614afda831083b0c1c31c9] # # patch "tests/t_inodeprints_update.at" # from [e4e1f37872811414024e259717206ca528267346] # to [b027c6458bbe47cef06d3c34a4d96594c956e6e7] # # patch "tests/t_lf_crlf.at" # from [19b497fd65b459240b83270df348bab82f09962c] # to [917077851f1c5d077f81251c60648e0ca4d1237d] # # patch "tests/t_log_outside_workspace.at" # from [408e3882754be40081c953771285895e36fd2de8] # to [1e54ecc7b774f1f2b485b79b0f931718cb175ec4] # # patch "tests/t_merge2_add.at" # from [f6e80ad60bcb50d48f402619d679e8625b680357] # to [70f7393bb7f12def5cc60fdaa6ae26185bcf84fd] # # patch "tests/t_merge2_data.at" # from [d98ab4146cc147822d4557176bec09e3905f8d4e] # to [f1adea0b23478d158fec1e945af77f4d497cc2e7] # # patch "tests/t_merge_add_del.at" # from [6e28c3a84a4c148144295fd22ea1648dcc8a6bb0] # to [70b04bd09907bcec19b64bfd3b7488d50d849ea2] # # patch "tests/t_merge_into_dir.at" # from [7c4cdfb3ef4fd2bbac8624cf2c8e8ce37da88412] # to [326175a419b2bb85df4dcf273cbae7b9d4e9ce9b] # # patch "tests/t_need_mt_revision.at" # from [3a1a8ade0d51e65a46325eaed1bd4236886a0d41] # to [cc930f17f155b0549b153fd11673d126081993a3] # # patch "tests/t_netsync_globs.at" # from [fdc7701de9af5a193798b8a25c745d8d15b62086] # to [553b6e8d18f08e907e1d84324326ec879820842b] # # patch "tests/t_netsync_permissions.at" # from [14dc033954a1e36979893b0f9b4d5daf4be18b82] # to [fde3b03429da042b17d3f25769f1e08f77c58733] # # patch "tests/t_netsync_unrelated.at" # from [03b78b51712b38681a244c815bf817720aab6d37] # to [ea99531edefc30bb3c7ff7ea6f82c3adb946b1f8] # # patch "tests/t_normalized_filenames.at" # from [752012e95dce64872e27021972a2bd715e03c3c1] # to [5623c494f751cd5da81aefd949514b360b1be284] # # patch "tests/t_persistent_server_revision.at" # from [04fe8d8a529d07a8bfbb01e999bbbb99eecb254b] # to [e18db2016f652c705292ae8a15514cd5a2fdfecb] # # patch "tests/t_pivot_root.at" # from [2bf3634c3c1a16c375a85bc5f403992422cdfc8b] # to [316bd971b0c94e9c7794b658fb26e3de8ae209b6] # # patch "tests/t_pivot_root_revert.at" # from [bf2c402b7cb49ebdd178928ea01372deb68858a5] # to [6bf97ef33b132ce9b52006a56c7c58d8cf5cd7f6] # # patch "tests/t_pivot_root_update.at" # from [e4f51059ec68ec4f187cd3593eeb49459aea3b5a] # to [c0b52066a67d15ed6fff40972de7707af5f6fbde] # # patch "tests/t_refresh_inodeprints.at" # from [8fc43d007b60a998430f6fd0dc56962c019511f4] # to [4a52c531307debc050c3f4fa55186141e5d3d68c] # # patch "tests/t_rename.at" # from [f9830fde9e91d2b2c97e3ec7d4c423d3e12d2726] # to [db57e180eba5fbf1ab8234c68f5af389d00f42c4] # # patch "tests/t_revert.at" # from [e21976b842ae9dedab8a25e085799937c11edaa8] # to [b7a13168d70cb6b35d4967cda0a8af2b0f85ba5f] # # patch "tests/t_revert_rename.at" # from [774aadd9782d5b42e8c7d30ab91db32bca9bd1d8] # to [18dd10d856fa1fd660a460a9cb6b03b2f2605849] # # patch "tests/t_select_cert.at" # from [b217cab9925b06a35421515e6a214a77a34d761d] # to [524a836a7ce677e089bbc9ad89f8c84599fa688f] # # patch "tests/t_serve_ignores_mt_options.at" # from [ab8c5d1a6a2eae5282dc0fbecc72bbb0cc9e52c4] # to [c7318436382fa91a8a3d0d67aaee1049b11b1def] # # patch "tests/t_setup_checkout_modify_new_dir.at" # from [6eda0e1493305bf3bfa55d94dc4eaddb5c9e0d49] # to [69ea1cf9eebce9fcc86928d50e456eb37e0c29a0] # # patch "tests/t_setup_creates_log.at" # from [a32f5408696019332ec79216c6252f1ba2ade66d] # to [e3c84e44d0c83997ff6b5cba8242a4de1a712e99] # # patch "tests/t_setup_existing_path.at" # from [ce17bd423597f38adb7065e230cc73e226aebfeb] # to [7b4b33c2ed726cbf00a4e38fbd7696baa8038b58] # # patch "tests/t_short_opts.at" # from [f633e5c60ec847a5b9cc42643e1be2d6c89788bd] # to [1457b0b8dc5ff7391d34f4c09eaa70f75a56a3e4] # # patch "tests/t_single_char_filenames.at" # from [f4492e7c63d5f93094d8f2bdea04d80854b41b31] # to [aeeaf4693e0414db9c0f512a3ec07888ab5d04e8] # # patch "tests/t_sink_has_extra_epochs.at" # from [0b9d5574dc645aac752334bf8d915551faf43faa] # to [1476ccf22fb668341183462217d355e0b075d35f] # # patch "tests/t_tags.at" # from [8b32ae2dbacb65d3e1071cdf9aaafa1caf521940] # to [f8ebf7132751a4bf8d4ae4ed58384095e30d9cae] # # patch "tests/t_undo_update.at" # from [23512408a71b29946fbeb5b1d5058c6a5f9abd87] # to [622c5975b220b26bf1815ec3eb9a680ad420ab5a] # # patch "tests/t_unreadable_MT.at" # from [d732c69dc8d90926de48dd11938a48b436265012] # to [1b4a381cf098a344f3a81ec1aefec35580afb7f8] # # patch "tests/t_update_branch.at" # from [b6390318109dc91675aa8a174de4a911cf9c8618] # to [33934ce6e4ef6bde1c5ccce8417cc1e7fe750224] # # patch "tests/t_update_inodeprints.at" # from [8e9ec9723a232850248e679a59a28c8ec043f3e9] # to [7918726b22ac7cac356448a1a9df80dd4afbe597] # # patch "tests/t_update_off_branch.at" # from [0a795cf6e182e2f8f2f5a9bea020b96177c4d3a0] # to [b9d36236416ad78ec83e04ad96bb342839ffff8b] # # patch "tests/t_update_switch_branch.at" # from [671401ca3e91c9879e3fdf48443960361d97d63b] # to [4dc9c4e7562dded128cca9b56ffb72398c4b6e42] # # patch "tests/t_update_with_blocked_rename.at" # from [dc86b21bd469bee17cb8df586f108a13a4a191be] # to [ec11f3c0fdf105effa16659c990631bbab76cc18] # # patch "tests/t_update_with_pending_add.at" # from [af1ac1b21a52bade76fa8fa92cae2c5be1a18321] # to [191a9bb03fe47fd446be8475be0b38c076b23851] # # patch "tests/t_update_with_pending_drop.at" # from [04407e4305991ff2358e52325d584674e8f0fcd2] # to [74cf8a3d47adaf7a50ed7b2488b39f0ae8039268] # # patch "tests/t_update_with_pending_rename.at" # from [2577008031f11dbdeaceeda708d4238b5b52c641] # to [da0deb279259309a94cd9838544b92ba8457b3df] # # patch "tests/t_versions.at" # from [49105adca6a5a867ec44be87731651eacb8cb437] # to [dad3fbfa60f5c9ae1f74fc7aac7913c655903a54] # ============================================================ --- ChangeLog f5d5baa78bef412900ee8f39c5150b0a2590c9da +++ ChangeLog cd405cfb4ce677be78ffa5dc7f276c9913b6fc3e @@ -1,5 +1,9 @@ 2006-03-28 Nathaniel Smith + * tests/*.at: s/MT/_MTN/. + +2006-03-28 Nathaniel Smith + * testsuite.at: s/MT/_MTN/. 2006-03-28 Nathaniel Smith ============================================================ --- tests/t_add_inside_MT.at d0760c6e2f24d3f968d4d66501ab0a17fdbd5e41 +++ tests/t_add_inside_MT.at 00e567e757fc46c5fad511d711fa5054df6f24c9 @@ -1,12 +1,12 @@ -AT_SETUP([add inside MT/]) +AT_SETUP([add inside _MTN/]) MONOTONE_SETUP AT_DATA(testfile1, [blah blah ]) -AT_DATA(MT/testfile2, [blah blah +AT_DATA(_MTN/testfile2, [blah blah ]) -AT_CHECK(cd MT && MONOTONE add testfile2, [1], [ignore], [ignore]) -AT_CHECK(cd MT && MONOTONE add ../testfile1, [], [ignore], [ignore]) +AT_CHECK(cd _MTN && MONOTONE add testfile2, [1], [ignore], [ignore]) +AT_CHECK(cd _MTN && MONOTONE add ../testfile1, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_add_intermediate_MT_path.at 2f59bba6a5f0be5473ab14fd45ece15679b49fe0 +++ tests/t_add_intermediate_MT_path.at d51569d27ae7c8ff8045553c5d778f05d9c369b7 @@ -1,62 +1,62 @@ # -*- Autoconf -*- -AT_SETUP([files with intermediate MT path elements]) +AT_SETUP([files with intermediate _MTN path elements]) MONOTONE_SETUP -AT_CHECK(mkdir -p dir1/MT) +AT_CHECK(mkdir -p dir1/_MTN) AT_CHECK(mkdir -p dir2) AT_CHECK(mkdir -p dir3) # Check both implicit recursive add... -AT_DATA(dir1/MT/testfile1, [testfile 1 +AT_DATA(dir1/_MTN/testfile1, [testfile 1 ]) -AT_DATA(dir2/MT, [MT file 1 +AT_DATA(dir2/_MTN, [_MTN file 1 ]) AT_CHECK(MONOTONE add dir1, [], [ignore], [ignore]) AT_CHECK(MONOTONE add dir2, [], [ignore], [ignore]) COMMIT(testbranch) # ...and explicit add. -AT_DATA(dir1/MT/testfile2, [testfile 2 +AT_DATA(dir1/_MTN/testfile2, [testfile 2 ]) -AT_DATA(dir3/MT, [MT file 2 +AT_DATA(dir3/_MTN, [_MTN file 2 ]) -AT_CHECK(MONOTONE add dir1/MT/testfile2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add dir3/MT, [], [ignore], [ignore]) +AT_CHECK(MONOTONE add dir1/_MTN/testfile2, [], [ignore], [ignore]) +AT_CHECK(MONOTONE add dir3/_MTN, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(MONOTONE checkout outdir1, [], [ignore], [ignore]) -AT_CHECK(cmp dir1/MT/testfile1 outdir1/dir1/MT/testfile1) -AT_CHECK(cmp dir1/MT/testfile2 outdir1/dir1/MT/testfile2) -AT_CHECK(cmp dir2/MT outdir1/dir2/MT) -AT_CHECK(cmp dir3/MT outdir1/dir3/MT) +AT_CHECK(cmp dir1/_MTN/testfile1 outdir1/dir1/_MTN/testfile1) +AT_CHECK(cmp dir1/_MTN/testfile2 outdir1/dir1/_MTN/testfile2) +AT_CHECK(cmp dir2/_MTN outdir1/dir2/_MTN) +AT_CHECK(cmp dir3/_MTN outdir1/dir3/_MTN) # renames -AT_CHECK(mv dir1/MT/testfile1 dir1/MT/testfile1x) -AT_CHECK(mv dir2/MT dir2/TM) +AT_CHECK(mv dir1/_MTN/testfile1 dir1/_MTN/testfile1x) +AT_CHECK(mv dir2/_MTN dir2/TM) AT_CHECK(mv dir3 dir3x) -AT_CHECK(MONOTONE rename dir1/MT/testfile1 dir1/MT/testfile1x, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename dir2/MT dir2/TM, [], [ignore], [ignore]) +AT_CHECK(MONOTONE rename dir1/_MTN/testfile1 dir1/_MTN/testfile1x, [], [ignore], [ignore]) +AT_CHECK(MONOTONE rename dir2/_MTN dir2/TM, [], [ignore], [ignore]) AT_CHECK(MONOTONE rename dir3 dir3x, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(MONOTONE checkout outdir2, [], [ignore], [ignore]) -AT_CHECK(cmp dir1/MT/testfile1x outdir2/dir1/MT/testfile1x) -AT_CHECK(cmp dir1/MT/testfile2 outdir2/dir1/MT/testfile2) +AT_CHECK(cmp dir1/_MTN/testfile1x outdir2/dir1/_MTN/testfile1x) +AT_CHECK(cmp dir1/_MTN/testfile2 outdir2/dir1/_MTN/testfile2) AT_CHECK(cmp dir2/TM outdir2/dir2/TM) -AT_CHECK(cmp dir3x/MT outdir2/dir3x/MT) +AT_CHECK(cmp dir3x/_MTN outdir2/dir3x/_MTN) # explicit drop -AT_CHECK(MONOTONE drop dir1/MT/testfile2, [], [ignore], [ignore]) +AT_CHECK(MONOTONE drop dir1/_MTN/testfile2, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(MONOTONE checkout outdir3, [], [ignore], [ignore]) -AT_CHECK(cmp dir1/MT/testfile1x outdir2/dir1/MT/testfile1x) -AT_CHECK(test ! -e outdir3/dir1/MT/testfile2) +AT_CHECK(cmp dir1/_MTN/testfile1x outdir2/dir1/_MTN/testfile1x) +AT_CHECK(test ! -e outdir3/dir1/_MTN/testfile2) # recursive drop @@ -64,9 +64,9 @@ COMMIT(testbranch) AT_CHECK(MONOTONE checkout outdir4, [], [ignore], [ignore]) -AT_CHECK(test ! -e outdir4/dir1/MT/testfile1x) -AT_CHECK(test ! -e outdir4/dir1/MT/testfile2) -AT_CHECK(test ! -e outdir4/dir1/MT) +AT_CHECK(test ! -e outdir4/dir1/_MTN/testfile1x) +AT_CHECK(test ! -e outdir4/dir1/_MTN/testfile2) +AT_CHECK(test ! -e outdir4/dir1/_MTN) AT_CHECK(test ! -e outdir4/dir1) AT_CLEANUP ============================================================ --- tests/t_annotate.at 37b6e3a6cf7622fdb94b0dcfe454d1d6044ff02a +++ tests/t_annotate.at 1ba28d0a9e3166399d5fa56839655a0f7f03cc0f @@ -121,7 +121,7 @@ REV6=`BASE_REVISION` # Now make right side -rm -rf MT +rm -rf _MTN AT_CHECK(MONOTONE co --revision=$REV4 ., [], [ignore], [ignore]) AT_DATA(bar0, [bar on right side of fork ============================================================ --- tests/t_annotate_branch_collision.at 9a98cd3c57767a584b7937a8ab2ddac086139847 +++ tests/t_annotate_branch_collision.at 844405fcd8b1ba3f12727568688da83e0b67b5c7 @@ -28,7 +28,7 @@ COMMIT(testbranch) REVL=`BASE_REVISION` -AT_CHECK(rm -r -f MT foo) +AT_CHECK(rm -r -f _MTN foo) AT_CHECK(MONOTONE setup --branch=testbranch .) AT_CHECK(cp foo.right foo) ============================================================ --- tests/t_cat_file_by_name.at a8bd5077ca1e36b9ce1082c3b844603afdfea3ea +++ tests/t_cat_file_by_name.at ad4272e1a30154bf67970b75cd5bca27b5a20a5a @@ -36,7 +36,7 @@ CHECK_SAME_CANONICALISED_STDOUT(cd subdir && MONOTONE cat -r $R0 testfile, cat subfile) -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) CHECK_SAME_CANONICALISED_STDOUT(MONOTONE cat -r $R0 testfile, cat r0testfile) ============================================================ --- tests/t_checkout_creates_log.at fc93238f54751248b4477b70b252b3ebfc8708fa +++ tests/t_checkout_creates_log.at a486e085ecd1ddf55dba3dfd63cc3c056117325c @@ -1,6 +1,6 @@ # -*- Autoconf -*- -AT_SETUP([checkout creates MT/log]) +AT_SETUP([checkout creates _MTN/log]) MONOTONE_SETUP @@ -10,7 +10,7 @@ end ]) -AT_DATA(MT/log, [Log entry +AT_DATA(_MTN/log, [Log entry ]) AT_DATA(input.txt, [version 0 of the file @@ -22,6 +22,6 @@ AT_CHECK(MONOTONE --branch=testbranch co testbranch) -AT_CHECK(test -f testbranch/MT/log -a ! -s MT/log) +AT_CHECK(test -f testbranch/_MTN/log -a ! -s _MTN/log) AT_CLEANUP ============================================================ --- tests/t_checkout_id_sets_branch.at c175a8f3ae4d59724dce18a21067d11e75390cc7 +++ tests/t_checkout_id_sets_branch.at 702d18e6aa83cfaa4ce94e27752c051ef4090c53 @@ -16,8 +16,8 @@ AT_CHECK(MONOTONE cert $REV branch otherbranch) # but, now we can't checkout without a --branch... -# need to make sure don't pick up branch from our local MT dir... -AT_CHECK(rm -rf MT) +# need to make sure don't pick up branch from our local _MTN dir... +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE checkout --revision=$REV codir2, [1], [ignore], [ignore]) AT_CHECK(MONOTONE checkout --revision=$REV --branch=testbranch codir3, [], [ignore], [ignore]) AT_CHECK(cmp foo codir3/foo) ============================================================ --- tests/t_checkout_noop_on_fail.at 4cc60ab6fd6480fbf55db6091c3c8a3a7c3b1e42 +++ tests/t_checkout_noop_on_fail.at 93a999e1a23a24adf8b94409af078ed564656aa4 @@ -1,14 +1,14 @@ AT_SETUP([failed checkout is a no-op]) MONOTONE_SETUP # If a checkout fails, no target directory should be created, and if -# the checkout directory already exists, no MT/ directory should be +# the checkout directory already exists, no _MTN/ directory should be # created. AT_CHECK(MONOTONE checkout --revision=bogus-id outdir, [1], [ignore], [ignore]) AT_CHECK(test ! -e outdir) AT_CHECK(mkdir outdir) AT_CHECK( (cd outdir && MONOTONE checkout --revision=bogus-id .), [1], [ignore], [ignore]) -AT_CHECK(test ! -e outdir/MT) +AT_CHECK(test ! -e outdir/_MTN) AT_CLEANUP ============================================================ --- tests/t_checkout_options.at e935f26986b7143bfe07dbee0ecd7a613017d008 +++ tests/t_checkout_options.at 24eeba0a23944dc0b0593d1dadfcb4dfc8868166 @@ -1,4 +1,4 @@ -AT_SETUP([checkout creates right MT/options]) +AT_SETUP([checkout creates right _MTN/options]) MONOTONE_SETUP ADD_FILE(testfile, [foo @@ -9,7 +9,7 @@ # We use RAW_MONOTONE because it used to be that passing --db= (as # MONOTONE does) would hide a bug in this functionality... -# all of these inherit options settings from the current MT dir +# all of these inherit options settings from the current _MTN dir # unless they override them on the command line AT_CHECK(RAW_MONOTONE checkout test_dir1, [], [ignore], [ignore]) @@ -29,11 +29,11 @@ for DIR in test_dir@<:@12345678@:>@; do AT_CHECK(echo DIR=$DIR, [], [ignore]) - AT_CHECK(test -f $DIR/MT/options) - AT_CHECK(QGREP(test.db $DIR/MT/options)) - AT_CHECK(QGREP(testbranch $DIR/MT/options)) + AT_CHECK(test -f $DIR/_MTN/options) + AT_CHECK(QGREP(test.db $DIR/_MTN/options)) + AT_CHECK(QGREP(testbranch $DIR/_MTN/options)) done -AT_CHECK(QGREP(foobar test_dir10/MT/options)) +AT_CHECK(QGREP(foobar test_dir10/_MTN/options)) AT_CLEANUP ============================================================ --- tests/t_commit_cancelled.at 02bcc53fbad3f78b36ab0dbae9b047845b6ad387 +++ tests/t_commit_cancelled.at 6bc3250c034ad7d70100775dbcc56582ce475bbd @@ -1,7 +1,7 @@ -AT_SETUP([MT/* handled correctly in aborted commit]) +AT_SETUP([_MTN/* handled correctly in aborted commit]) MONOTONE_SETUP -# MT/* means MT/revision and MT/work +# _MTN/* means _MTN/revision and _MTN/work ADD_FILE(testfile, [blah blah ]) @@ -10,12 +10,12 @@ ADD_FILE(otherfile, [stuff stuff ]) -AT_DATA(MT/log, [message message +AT_DATA(_MTN/log, [message message ]) -AT_CHECK(cp MT/log good_log) -AT_CHECK(cp MT/revision good_revision) -AT_CHECK(cp MT/work good_work) +AT_CHECK(cp _MTN/log good_log) +AT_CHECK(cp _MTN/revision good_revision) +AT_CHECK(cp _MTN/work good_work) AT_DATA(bad_edit_comment.lua, [function edit_comment(basetext, user_log_message) return "" @@ -26,9 +26,9 @@ # Since this commit was canceled due to a problem with the log # message, the old log message have been preserved -AT_CHECK(cmp MT/log good_log) +AT_CHECK(cmp _MTN/log good_log) -AT_CHECK(cmp MT/revision good_revision) -AT_CHECK(cmp MT/work good_work) +AT_CHECK(cmp _MTN/revision good_revision) +AT_CHECK(cmp _MTN/work good_work) AT_CLEANUP ============================================================ --- tests/t_commit_log_1.at 7f484d7237acc02b49235fcbd05fee00fb3ff4e7 +++ tests/t_commit_log_1.at d1d63ad1f1c2d3067d11edab3cf3b34c41754a90 @@ -1,6 +1,6 @@ # -*- Autoconf -*- -AT_SETUP([commit using MT/log]) +AT_SETUP([commit using _MTN/log]) MONOTONE_SETUP @@ -10,7 +10,7 @@ end ]) -AT_DATA(MT/log, [Log entry +AT_DATA(_MTN/log, [Log entry ]) AT_DATA(input.txt, [version 0 of the file @@ -21,7 +21,7 @@ AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_log.lua commit, [], [ignore], [ignore]) TSHA=`BASE_REVISION` -AT_CHECK(test -f MT/log -a ! -s MT/log) +AT_CHECK(test -f _MTN/log -a ! -s _MTN/log) AT_CHECK(MONOTONE ls certs $TSHA, [], [stdout], [ignore]) AT_CHECK(QGREP('Log entry' stdout), []) ============================================================ --- tests/t_commit_log_2.at 367f752f3e6fe48cdb41a182b9428129d32de8ee +++ tests/t_commit_log_2.at 7b2c34e61c1b915006e335baaa65a95c675bd5c3 @@ -1,10 +1,10 @@ # -*- Autoconf -*- -AT_SETUP([commit w/o MT/log being present]) +AT_SETUP([commit w/o _MTN/log being present]) MONOTONE_SETUP -AT_CHECK(rm -f MT/log) +AT_CHECK(rm -f _MTN/log) AT_DATA(input.txt, [version 0 of the file ]) ============================================================ --- tests/t_commit_log_3.at 2fe89aa0cdb1a484618aa1663551a1017ab85028 +++ tests/t_commit_log_3.at 0683464b8b1bcfc2c40959accad8d22a17f69691 @@ -1,6 +1,6 @@ # -*- Autoconf -*- -AT_SETUP([commit using MT/log and --message]) +AT_SETUP([commit using _MTN/log and --message]) MONOTONE_SETUP @@ -10,7 +10,7 @@ end ]) -AT_DATA(MT/log, [Log entry +AT_DATA(_MTN/log, [Log entry ]) AT_DATA(input.txt, [version 0 of the file ============================================================ --- tests/t_commit_log_writeback.at 249e8f82f7c779dbc9de6d0c327ff2494dba91c6 +++ tests/t_commit_log_writeback.at 5904bab9a698da393511233261e1d26b6a151fcf @@ -1,4 +1,4 @@ -AT_SETUP([commit writes message back to MT/log]) +AT_SETUP([commit writes message back to _MTN/log]) MONOTONE_SETUP ADD_FILE(testfile, [blah blah @@ -16,21 +16,21 @@ AT_CHECK(MONOTONE commit -btestbranch --rcfile=my_hook.lua, [1], [ignore], [ignore]) -CHECK_SAME_CANONICALISED_STDOUT(echo "foobar", cat MT/log) +CHECK_SAME_CANONICALISED_STDOUT(echo "foobar", cat _MTN/log) -AT_CHECK(rm -f MT/log) -AT_CHECK(touch MT/log) +AT_CHECK(rm -f _MTN/log) +AT_CHECK(touch _MTN/log) -# -m messages don't get written out to MT/log +# -m messages don't get written out to _MTN/log # (if they do, it breaks the workflow: # $ monotone commit -m 'foo' # # # $ monotone commit -m 'foo' -# error, MT/log non-empty and -m specified +# error, _MTN/log non-empty and -m specified AT_CHECK(MONOTONE commit -btestbranch -m "blah blah", [1], [ignore], [ignore]) -# So MT/log should still be empty -AT_CHECK(test -s MT/log, [1]) +# So _MTN/log should still be empty +AT_CHECK(test -s _MTN/log, [1]) AT_CLEANUP ============================================================ --- tests/t_commit_message_file.at ff5ee2bfe41e4807ee909ee5319db3d7eff38173 +++ tests/t_commit_message_file.at 9083f8d8c0f6a978c6421c4f9f352acd2652a95c @@ -1,8 +1,8 @@ AT_SETUP([commit with --message-file]) MONOTONE_SETUP -AT_CHECK(rm -f MT/log) +AT_CHECK(rm -f _MTN/log) #-------------------- #first, verify that --message-file actually works @@ -58,7 +58,7 @@ AT_CHECK(MONOTONE --branch=testbranch commit --message-file=msgfile.txt --message="also a message", [1], [ignore], [ignore]) # -------------------- -# finally, --message-file and a filled MT/log should also fail +# finally, --message-file and a filled _MTN/log should also fail # -------------------- AT_DATA(commit_log.lua, [ @@ -67,7 +67,7 @@ end ]) -AT_DATA(MT/log, [Log entry +AT_DATA(_MTN/log, [Log entry ]) AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_log.lua commit --message-file=msgfile.txt, [1], [ignore], [ignore]) ============================================================ --- tests/t_cwork.at c62e74c66fee35e02b6279e799d3495aafe09377 +++ tests/t_cwork.at 4c46c95e3ad1871a06fce9c5f94a00fc97930014 @@ -13,9 +13,9 @@ AT_CHECK(MONOTONE --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) V1=`BASE_REVISION` AT_CHECK(MONOTONE add testfile1, [], [ignore], [ignore]) -AT_CHECK(test -e MT/work, [], [ignore]) -AT_CHECK(rm -rf MT) +AT_CHECK(test -e _MTN/work, [], [ignore]) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE checkout --revision=$V1 ., [], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_database_check.at 81f66e97321a631d0a5e3e089d1f25dc57d80aa9 +++ tests/t_database_check.at 78904ea3f51596f3a21b6aea39af1e6621ac7966 @@ -59,7 +59,7 @@ REV4=`BASE_REVISION` AT_CHECK(MONOTONE db execute "delete from revisions where id='$REV4'", [0], [ignore], [ignore]) # revert to the old workspace state -AT_CHECK(echo $REV3 > MT/revision) +AT_CHECK(echo $REV3 > _MTN/revision) # remove another file too AT_CHECK(MONOTONE db execute "delete from files where id='$FILE3'", [], [ignore], [ignore]) ============================================================ --- tests/t_database_check_normalized.at 903b3a090390261102a713b0339e99322d728f16 +++ tests/t_database_check_normalized.at d89c3d1d57ac11406b965a7d1f7ba69f1bb21381 @@ -6,7 +6,7 @@ # hence the database doesn't have correctly normalised revisions. # for future reference, it was created with a modified monotone binary, -# paths.cc was modified. Also, the 'add_dir "."' was added to MT/work by hand. +# paths.cc was modified. Also, the 'add_dir "."' was added to _MTN/work by hand. #old_revision [] # ============================================================ --- tests/t_db_with_dots.at 69973200a20d087bb2701a5c5e8c927ae54e53d2 +++ tests/t_db_with_dots.at b54df6de2ea3fa178dca93aa6003c7273871206d @@ -5,11 +5,11 @@ AT_CHECK( (cd foo && MONOTONE --db=../new.db db init), [], [ignore], [ignore]) AT_CHECK( (cd foo && MONOTONE --db=../new.db ls branches), [], [ignore], [ignore]) -# paths in MT/options should be absolute and not contain .. +# paths in _MTN/options should be absolute and not contain .. AT_CHECK(mkdir bar) AT_CHECK( (cd bar && MONOTONE --db=../new.db --branch=testbranch setup .), [], [ignore], [ignore]) -AT_CHECK(grep new.db bar/MT/options, [], [ignore], [ignore]) -AT_CHECK(grep new.db bar/MT/options | grep -v '\.\.', [], [ignore], [ignore]) +AT_CHECK(grep new.db bar/_MTN/options, [], [ignore], [ignore]) +AT_CHECK(grep new.db bar/_MTN/options | grep -v '\.\.', [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_diff_outside_workspace.at 91e929a8e18167fc073b033b782d50c04d0dabad +++ tests/t_diff_outside_workspace.at 933f39d768ce47a78389a31fd6a05d15dc6f29b8 @@ -16,7 +16,7 @@ AT_CHECK(MONOTONE --branch=testbranch commit --message bleh, [], [ignore], [ignore]) second=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE diff --revision=$parent --revision=$second, [], [ignore], [ignore]) # check it works when specifying files AT_CHECK(MONOTONE diff --revision=$parent --revision=$second foo2 --debug, [], [ignore], [ignore]) ============================================================ --- tests/t_epoch_unidirectional.at 8a53bc343a7e48d20843b89a6e77c208de84c38c +++ tests/t_epoch_unidirectional.at f03f544695c15425f879c7534003c29e82634e21 @@ -10,7 +10,7 @@ ]) COMMIT(testbranch) -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE2 setup --branch=testbranch .) AT_DATA(otherfile, [some data ]) ============================================================ --- tests/t_inodeprints.at d67a539bc4da605a1959d597bf5747557bc3548f +++ tests/t_inodeprints.at 0a0246b22800058dfde20a03e8998bd18547682c @@ -1,8 +1,8 @@ AT_SETUP([inodeprints]) MONOTONE_SETUP # Turn them on -AT_CHECK(touch MT/inodeprints) +AT_CHECK(touch _MTN/inodeprints) AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) AT_CHECK(QGREP("no changes" stdout)) @@ -16,8 +16,8 @@ COMMIT(testbranch) # Something should have been written to it -AT_CHECK(test -s MT/inodeprints) -AT_CHECK(cp MT/inodeprints ip1) +AT_CHECK(test -s _MTN/inodeprints) +AT_CHECK(cp _MTN/inodeprints ip1) # And stuff should still work AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) @@ -35,7 +35,7 @@ AT_CHECK(MONOTONE commit otherfile --message=foo, [], [ignore], [ignore]) # Should have changed the inodeprints file -AT_CHECK(cmp MT/inodeprints ip1, [1], [ignore], [ignore]) +AT_CHECK(cmp _MTN/inodeprints ip1, [1], [ignore], [ignore]) # Still should think testfile is modified AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) ============================================================ --- tests/t_inodeprints_hook.at 9ba633b9cd6acf2c4c7630336f4f9755e14a86ef +++ tests/t_inodeprints_hook.at 8dc6552d5c04b58070614afda831083b0c1c31c9 @@ -13,26 +13,26 @@ end ]) -AT_CHECK(test ! -e MT/inodeprints) +AT_CHECK(test ! -e _MTN/inodeprints) ADD_FILE(testfile, [blah blah ]) COMMIT(testbranch) REV=`BASE_REVISION` AT_CHECK(MONOTONE setup --branch=testbranch setup_default, [], [ignore], [ignore]) -AT_CHECK(test ! -e setup_default/MT/inodeprints) +AT_CHECK(test ! -e setup_default/_MTN/inodeprints) AT_CHECK(MONOTONE checkout --revision=$REV co_default, [], [ignore], [ignore]) -AT_CHECK(test ! -e co_default/MT/inodeprints) +AT_CHECK(test ! -e co_default/_MTN/inodeprints) AT_CHECK(MONOTONE --rcfile=off.lua setup --branch=testbranch setup_off, [], [ignore], [ignore]) -AT_CHECK(test ! -e setup_off/MT/inodeprints) +AT_CHECK(test ! -e setup_off/_MTN/inodeprints) AT_CHECK(MONOTONE --rcfile=off.lua checkout --revision=$REV co_off, [], [ignore], [ignore]) -AT_CHECK(test ! -e co_off/MT/inodeprints) +AT_CHECK(test ! -e co_off/_MTN/inodeprints) AT_CHECK(MONOTONE --rcfile=on.lua setup --branch=testbranch setup_on, [], [ignore], [ignore]) -AT_CHECK(test -e setup_on/MT/inodeprints) +AT_CHECK(test -e setup_on/_MTN/inodeprints) AT_CHECK(MONOTONE --rcfile=on.lua checkout --revision=$REV co_on, [], [ignore], [ignore]) -AT_CHECK(test -e co_on/MT/inodeprints) -AT_CHECK(test -s co_on/MT/inodeprints) +AT_CHECK(test -e co_on/_MTN/inodeprints) +AT_CHECK(test -s co_on/_MTN/inodeprints) AT_CLEANUP ============================================================ --- tests/t_inodeprints_update.at e4e1f37872811414024e259717206ca528267346 +++ tests/t_inodeprints_update.at b027c6458bbe47cef06d3c34a4d96594c956e6e7 @@ -12,8 +12,8 @@ R1=`BASE_REVISION` AT_CHECK(MONOTONE checkout --branch=testbranch --revision=$R0 td, [], [ignore], [ignore]) -AT_CHECK(touch td/MT/inodeprints) +AT_CHECK(touch td/_MTN/inodeprints) AT_CHECK(cd td && MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(test -s td/MT/inodeprints) +AT_CHECK(test -s td/_MTN/inodeprints) AT_CLEANUP ============================================================ --- tests/t_lf_crlf.at 19b497fd65b459240b83270df348bab82f09962c +++ tests/t_lf_crlf.at 917077851f1c5d077f81251c60648e0ca4d1237d @@ -30,7 +30,7 @@ AT_CHECK(MONOTONE --rcfile=linesep.lua commit -m foofoo, [], [ignore], [ignore]) FOO_FOO_REV=`BASE_REVISION` -rm -Rf MT +rm -Rf _MTN AT_CHECK(MONOTONE --rcfile=linesep.lua co --revision=$FOO_REV ., [], [ignore], [ignore]) AT_CHECK(cmp foo foo.crlf, [], [ignore], [ignore]) ============================================================ --- tests/t_log_outside_workspace.at 408e3882754be40081c953771285895e36fd2de8 +++ tests/t_log_outside_workspace.at 1e54ecc7b774f1f2b485b79b0f931718cb175ec4 @@ -13,7 +13,7 @@ AT_CHECK(MONOTONE --branch=testbranch commit --message blah, [], [ignore], [ignore]) parent=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE log --revision=$parent foo1, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_merge2_add.at f6e80ad60bcb50d48f402619d679e8625b680357 +++ tests/t_merge2_add.at 70f7393bb7f12def5cc60fdaa6ae26185bcf84fd @@ -9,7 +9,7 @@ COMMIT(testbranch) LEFT=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE setup --branch=testbranch .) ADD_FILE(testfile2, [This is test file 2 ============================================================ --- tests/t_merge2_data.at d98ab4146cc147822d4557176bec09e3905f8d4e +++ tests/t_merge2_data.at f1adea0b23478d158fec1e945af77f4d497cc2e7 @@ -20,7 +20,7 @@ COMMIT(testbranch) LEFT=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE setup --branch=testbranch .) AT_CHECK(cp -f right testfile) ============================================================ --- tests/t_merge_add_del.at 6e28c3a84a4c148144295fd22ea1648dcc8a6bb0 +++ tests/t_merge_add_del.at 70b04bd09907bcec19b64bfd3b7488d50d849ea2 @@ -70,7 +70,7 @@ AT_CHECK(MONOTONE propagate branch.main branch.fork, [], [ignore], [ignore]) # check -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE --branch=branch.fork checkout .) AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) ============================================================ --- tests/t_merge_into_dir.at 7c4cdfb3ef4fd2bbac8624cf2c8e8ce37da88412 +++ tests/t_merge_into_dir.at 326175a419b2bb85df4dcf273cbae7b9d4e9ce9b @@ -1,13 +1,13 @@ AT_SETUP([merge a project into a subdirectory of an unrelated project]) MONOTONE_SETUP -AT_CHECK(cp -r MT MT.orig) +AT_CHECK(cp -r _MTN MT.orig) ADD_FILE(file1, [foo ]) COMMIT(b1) -AT_CHECK(rm -r MT) -AT_CHECK(cp -r MT.orig MT) +AT_CHECK(rm -r _MTN) +AT_CHECK(cp -r MT.orig _MTN) AT_CHECK(rm file1) ADD_FILE(file2, [bar ]) ============================================================ --- tests/t_need_mt_revision.at 3a1a8ade0d51e65a46325eaed1bd4236886a0d41 +++ tests/t_need_mt_revision.at cc930f17f155b0549b153fd11673d126081993a3 @@ -1,4 +1,4 @@ -AT_SETUP([MT/revision is required]) +AT_SETUP([_MTN/revision is required]) MONOTONE_SETUP ADD_FILE(foo, [blah blah @@ -14,7 +14,7 @@ AT_CHECK(rm -f bar) AT_CHECK(MONOTONE ls missing, [], [ignore], [ignore]) -AT_CHECK(rm -f MT/revision) +AT_CHECK(rm -f _MTN/revision) AT_CHECK(MONOTONE ls missing, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_netsync_globs.at fdc7701de9af5a193798b8a25c745d8d15b62086 +++ tests/t_netsync_globs.at 553b6e8d18f08e907e1d84324326ec879820842b @@ -7,14 +7,14 @@ COMMIT(1branch1) REV11=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE setup --branch=testbranch .) ADD_FILE(testfile, [bar ]) COMMIT(1branch2) REV12=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE setup --branch=testbranch .) ADD_FILE(testfile, [baz ]) ============================================================ --- tests/t_netsync_permissions.at 14dc033954a1e36979893b0f9b4d5daf4be18b82 +++ tests/t_netsync_permissions.at fde3b03429da042b17d3f25769f1e08f77c58733 @@ -114,7 +114,7 @@ AT_CHECK(cp clean.db test.db) AT_CHECK(rm -r keys && cp -r clean_keys/ keys) -AT_DATA(MT/revision []) +AT_DATA(_MTN/revision []) ADD_N_FILE(2, testfile, [testfile ]) ============================================================ --- tests/t_netsync_unrelated.at 03b78b51712b38681a244c815bf817720aab6d37 +++ tests/t_netsync_unrelated.at ea99531edefc30bb3c7ff7ea6f82c3adb946b1f8 @@ -31,7 +31,7 @@ CHECK_SAME_STDOUT(MONOTONE automate graph, MONOTONE2 automate graph) CHECK_SAME_STDOUT(MONOTONE ls certs $BASE, MONOTONE ls certs $BASE) -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE setup --branch=testbranch ., [], [ignore], [ignore]) ADD_FILE(testfile2, [This is test file 2 ============================================================ --- tests/t_normalized_filenames.at 752012e95dce64872e27021972a2bd715e03c3c1 +++ tests/t_normalized_filenames.at 5623c494f751cd5da81aefd949514b360b1be284 @@ -5,11 +5,11 @@ ]) # The UI used to fix these, while later code did not, so let's check # the inner code directly. -AT_DATA(MT/work, [add_dir "." +AT_DATA(_MTN/work, [add_dir "." ]) AT_CHECK(MONOTONE automate get_manifest_of, [3], [ignore], [ignore]) -AT_DATA(MT/work, [add_dir "./bar" +AT_DATA(_MTN/work, [add_dir "./bar" ]) AT_CHECK(MONOTONE automate get_manifest_of, [3], [ignore], [ignore]) ============================================================ --- tests/t_persistent_server_revision.at 04fe8d8a529d07a8bfbb01e999bbbb99eecb254b +++ tests/t_persistent_server_revision.at e18db2016f652c705292ae8a15514cd5a2fdfecb @@ -10,7 +10,7 @@ AT_CHECK(MONOTONE2 commit --branch=testbranch --message foo, [], [ignore], [ignore]) REV1=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_DATA(otherfile, [stuff stuff nonsense @@ -43,7 +43,7 @@ AT_CHECK(MONOTONE3 commit --branch=testbranch --message foo, [], [ignore], [ignore]) REV3=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE2 checkout --revision=$REV1 ., [], [ignore], [ignore]) AT_DATA(testfile, [ptang ]) ============================================================ --- tests/t_pivot_root.at 2bf3634c3c1a16c375a85bc5f403992422cdfc8b +++ tests/t_pivot_root.at 316bd971b0c94e9c7794b658fb26e3de8ae209b6 @@ -1,10 +1,10 @@ AT_SETUP([pivot_root]) MONOTONE_SETUP # possible problems: # -- the new root doesn't exist # -- the new root is not a dir -# -- the new root has an MT in it +# -- the new root has an _MTN in it # -- the directory the old root is supposed to end up in doesn't exist # -- the directory the old root is supposed to end up in is not a directory # -- the directory the old root is supposed to end up in already @@ -19,7 +19,7 @@ AT_DATA(workspace/dir1/file1, [blah blah ]) AT_CHECK(mkdir workspace/dir3) -AT_CHECK(mkdir workspace/dir3/MT) +AT_CHECK(mkdir workspace/dir3/_MTN) AT_CHECK(cd workspace/ && MONOTONE add ., [], [ignore], [ignore]) AT_CHECK(cd workspace/ && MONOTONE commit -m foo, [], [ignore], [ignore]) @@ -37,12 +37,12 @@ AT_CHECK(cd workspace/ && MONOTONE pivot_root --execute dir1 old_root, [], [ignore], [ignore]) -AT_CHECK(test -d workspace/MT) +AT_CHECK(test -d workspace/_MTN) AT_CHECK(test -d workspace/dir2) AT_CHECK(test -f workspace/file1) AT_CHECK(test -d workspace/old_root) AT_CHECK(test -d workspace/old_root/dir3) -AT_CHECK(test -d workspace/old_root/dir3/MT) +AT_CHECK(test -d workspace/old_root/dir3/_MTN) AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], []) AT_CHECK(cd workspace/ && MONOTONE ls unknown, [], [], []) ============================================================ --- tests/t_pivot_root_revert.at bf2c402b7cb49ebdd178928ea01372deb68858a5 +++ tests/t_pivot_root_revert.at 6bf97ef33b132ce9b52006a56c7c58d8cf5cd7f6 @@ -14,31 +14,31 @@ AT_DATA(workspace/dir1/file1, [blah blah ]) AT_CHECK(mkdir workspace/dir3) -AT_CHECK(mkdir workspace/dir3/MT) +AT_CHECK(mkdir workspace/dir3/_MTN) AT_CHECK(cd workspace/ && MONOTONE add ., [], [ignore], [ignore]) AT_CHECK(cd workspace/ && MONOTONE commit -m foo, [], [ignore], [ignore]) AT_CHECK(cd workspace/ && MONOTONE pivot_root --execute dir1 old_root, [], [ignore], [ignore]) -AT_CHECK(test -d workspace/MT) +AT_CHECK(test -d workspace/_MTN) AT_CHECK(test -d workspace/dir2) AT_CHECK(test -f workspace/file1) AT_CHECK(test -d workspace/old_root) AT_CHECK(test -d workspace/old_root/dir3) -AT_CHECK(test -d workspace/old_root/dir3/MT) +AT_CHECK(test -d workspace/old_root/dir3/_MTN) AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], []) AT_CHECK(cd workspace/ && MONOTONE ls unknown, [], [], []) AT_CHECK(cd workspace/ && MONOTONE revert ., [], [ignore], [ignore]) -AT_CHECK(test -d workspace/MT) +AT_CHECK(test -d workspace/_MTN) AT_CHECK(test -d workspace/dir1) AT_CHECK(test -d workspace/dir1/dir2) AT_CHECK(test -f workspace/dir1/file1) AT_CHECK(test -d workspace/dir3) -AT_CHECK(test -d workspace/dir3/MT) +AT_CHECK(test -d workspace/dir3/_MTN) AT_CHECK(cd workspace/ && MONOTONE ls changed, [], [], []) AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], []) ============================================================ --- tests/t_pivot_root_update.at e4f51059ec68ec4f187cd3593eeb49459aea3b5a +++ tests/t_pivot_root_update.at c0b52066a67d15ed6fff40972de7707af5f6fbde @@ -11,7 +11,7 @@ ]) AT_CHECK(cd workspace/ && MONOTONE add ., [], [ignore], [ignore]) AT_CHECK(cd workspace/ && MONOTONE commit -m foo, [], [ignore], [ignore]) -BASE_REV=`cat workspace/MT/revision` +BASE_REV=`cat workspace/_MTN/revision` AT_CHECK(cd workspace/ && MONOTONE pivot_root --execute dir1 old_root, [], [ignore], [ignore]) AT_CHECK(cd workspace/ && MONOTONE commit -m foo, [], [ignore], [ignore]) ============================================================ --- tests/t_refresh_inodeprints.at 8fc43d007b60a998430f6fd0dc56962c019511f4 +++ tests/t_refresh_inodeprints.at 4a52c531307debc050c3f4fa55186141e5d3d68c @@ -5,10 +5,10 @@ ]) COMMIT(testbranch) -AT_CHECK(test -e MT/inodeprints, [1]) +AT_CHECK(test -e _MTN/inodeprints, [1]) AT_CHECK(MONOTONE refresh_inodeprints) -AT_CHECK(test -s MT/inodeprints) +AT_CHECK(test -s _MTN/inodeprints) AT_CLEANUP ============================================================ --- tests/t_rename.at f9830fde9e91d2b2c97e3ec7d4c423d3e12d2726 +++ tests/t_rename.at db57e180eba5fbf1ab8234c68f5af389d00f42c4 @@ -38,16 +38,16 @@ # rename a rename target AT_CHECK(MONOTONE rename bleh blah, [], [ignore], [ignore]) -AT_CHECK(grep bleh MT/work, [0], [ignore], [ignore]) -AT_CHECK(grep blah MT/work, [0], [ignore], [ignore]) +AT_CHECK(grep bleh _MTN/work, [0], [ignore], [ignore]) +AT_CHECK(grep blah _MTN/work, [0], [ignore], [ignore]) AT_CHECK(MONOTONE rename blah blyh, [], [ignore], [ignore]) -AT_CHECK(grep bleh MT/work, [0], [ignore], [ignore]) -AT_CHECK(grep blah MT/work, [1], [ignore], [ignore]) -AT_CHECK(grep blyh MT/work, [0], [ignore], [ignore]) +AT_CHECK(grep bleh _MTN/work, [0], [ignore], [ignore]) +AT_CHECK(grep blah _MTN/work, [1], [ignore], [ignore]) +AT_CHECK(grep blyh _MTN/work, [0], [ignore], [ignore]) # undo a rename AT_CHECK(MONOTONE rename blyh bleh, [], [ignore], [ignore]) -AT_CHECK(test -f MT/work, [1], [ignore], [ignore]) +AT_CHECK(test -f _MTN/work, [1], [ignore], [ignore]) # move file before renaming it AT_CHECK(MONOTONE status, [], [ignore], [ignore]) ============================================================ --- tests/t_revert.at e21976b842ae9dedab8a25e085799937c11edaa8 +++ tests/t_revert.at b7a13168d70cb6b35d4967cda0a8af2b0f85ba5f @@ -30,7 +30,7 @@ AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) @@ -38,11 +38,11 @@ # check reverting a delete AT_CHECK(MONOTONE drop testfile0, [0], [ignore], [ignore]) -AT_CHECK(grep testfile0 MT/work, [0], [ignore]) +AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) @@ -51,11 +51,11 @@ AT_CHECK(echo 'liver and maude' >> testfile0, [], [ignore]) AT_CHECK(MONOTONE drop testfile0, [0], [ignore], [ignore]) -AT_CHECK(grep testfile0 MT/work, [0], [ignore]) +AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(MONOTONE revert testfile0, [], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) V3=`SHA1(testfile0)` @@ -66,11 +66,11 @@ AT_DATA(testfile1, [squirrils monkeys dingos ]) AT_CHECK(MONOTONE add testfile1, [0], [ignore], [ignore]) -AT_CHECK(grep testfile1 MT/work, [0], [ignore]) +AT_CHECK(grep testfile1 _MTN/work, [0], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile1 stdout, [0], [ignore]) AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile1 stdout, [1], [ignore]) @@ -119,19 +119,19 @@ AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) AT_CHECK(grep foofile2 stdout, [0], [ignore]) -AT_CHECK(test -e MT/work, [], [ignore]) +AT_CHECK(test -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE revert sub/foofile2, [], [stdout]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) AT_CHECK(grep foofile2 stdout, [1], [ignore]) -AT_CHECK(test -e MT/work, [], [ignore]) +AT_CHECK(test -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE revert foofile0, [], [stdout]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep foofile0 stdout, [1], [ignore]) AT_CHECK(grep foofile2 stdout, [1], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) # check that "revert" by itself just prints usage. AT_CHECK(echo blah > foofile0, []) ============================================================ --- tests/t_revert_rename.at 774aadd9782d5b42e8c7d30ab91db32bca9bd1d8 +++ tests/t_revert_rename.at 18dd10d856fa1fd660a460a9cb6b03b2f2605849 @@ -11,13 +11,13 @@ AT_DATA(foofile0, [squirrils monkeys dingos ]) AT_CHECK(MONOTONE rename testfile0 foofile0, [], [ignore], [ignore]) -AT_CHECK(grep testfile0 MT/work, [0], [ignore]) -AT_CHECK(grep foofile0 MT/work, [0], [ignore]) +AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) +AT_CHECK(grep foofile0 _MTN/work, [0], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) AT_CHECK(MONOTONE revert foofile0, [0], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) AT_CHECK(grep foofile0 stdout, [1], [ignore]) @@ -25,13 +25,13 @@ AT_DATA(foofile0, [squirrils monkeys dingos ]) AT_CHECK(MONOTONE rename testfile0 foofile0, [], [ignore], [ignore]) -AT_CHECK(grep testfile0 MT/work, [0], [ignore]) -AT_CHECK(grep foofile0 MT/work, [0], [ignore]) +AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) +AT_CHECK(grep foofile0 _MTN/work, [0], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) AT_CHECK(MONOTONE revert testfile0, [0], [ignore], [ignore]) -AT_CHECK(test ! -e MT/work, [], [ignore]) +AT_CHECK(test ! -e _MTN/work, [], [ignore]) AT_CHECK(MONOTONE status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) AT_CHECK(grep foofile0 stdout, [1], [ignore]) ============================================================ --- tests/t_select_cert.at b217cab9925b06a35421515e6a214a77a34d761d +++ tests/t_select_cert.at 524a836a7ce677e089bbc9ad89f8c84599fa688f @@ -38,11 +38,11 @@ AT_CHECK(grep 'has multiple ambiguous expansions' stderr, [0], [ignore]) # Check that exact value succeed... -rm -Rf MT +rm -Rf _MTN AT_CHECK(MONOTONE co --revision='c:testcert=value' ., [], [ignore], [ignore]) AT_CHECK(cmp testfile testfile2, [], [ignore]) -rm -Rf MT +rm -Rf _MTN AT_CHECK(MONOTONE co --revision='c:testcert=value=with=equal=signs' ., [], [ignore], [ignore]) AT_CHECK(cmp testfile testfile1, [], [ignore]) ============================================================ --- tests/t_serve_ignores_mt_options.at ab8c5d1a6a2eae5282dc0fbecc72bbb0cc9e52c4 +++ tests/t_serve_ignores_mt_options.at c7318436382fa91a8a3d0d67aaee1049b11b1def @@ -1,6 +1,6 @@ # -*- Autoconf -*- -AT_SETUP([checking that certain commands ignores the contents of MT/options]) +AT_SETUP([checking that certain commands ignores the contents of _MTN/options]) MONOTONE_SETUP @@ -12,18 +12,18 @@ AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) AT_CHECK(MONOTONE --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) -# Hack MT/options -AT_CHECK([sed -e 's/key ".*"/key "address@hidden"/' < MT/options > MT/options.new]) -AT_CHECK([mv MT/options.new MT/options]) -# Double-check that MT/options was correctly hacked -AT_CHECK([grep 'key "address@hidden"' MT/options], [1], [ignore], [ignore]) -AT_CHECK([grep 'key "address@hidden"' MT/options], [0], [ignore], [ignore]) +# Hack _MTN/options +AT_CHECK([sed -e 's/key ".*"/key "address@hidden"/' < _MTN/options > _MTN/options.new]) +AT_CHECK([mv _MTN/options.new _MTN/options]) +# Double-check that _MTN/options was correctly hacked +AT_CHECK([grep 'key "address@hidden"' _MTN/options], [1], [ignore], [ignore]) +AT_CHECK([grep 'key "address@hidden"' _MTN/options], [0], [ignore], [ignore]) # Let's see RUN_NETSYNC fly, making sure we use an existing key. Without the # explicit --key option, this push would try to use the hacked identity and # promptly fail, and that's not what we're after. # The server, though, doesn't get this explicit key specification, so this -# will test if it (wrongly) gets a key value from MT/options or if it takes +# will test if it (wrongly) gets a key value from _MTN/options or if it takes # whatever key that's available in keys2/... RUN_NETSYNC([push address@hidden, [testbranch]) ============================================================ --- tests/t_setup_checkout_modify_new_dir.at 6eda0e1493305bf3bfa55d94dc4eaddb5c9e0d49 +++ tests/t_setup_checkout_modify_new_dir.at 69ea1cf9eebce9fcc86928d50e456eb37e0c29a0 @@ -1,4 +1,4 @@ -AT_SETUP([setup/checkout touch new MT/options only]) +AT_SETUP([setup/checkout touch new _MTN/options only]) MONOTONE_SETUP ADD_FILE(foo, [blah blah ============================================================ --- tests/t_setup_creates_log.at a32f5408696019332ec79216c6252f1ba2ade66d +++ tests/t_setup_creates_log.at e3c84e44d0c83997ff6b5cba8242a4de1a712e99 @@ -1,9 +1,9 @@ # -*- Autoconf -*- -AT_SETUP([setup creates MT/log]) +AT_SETUP([setup creates _MTN/log]) MONOTONE_SETUP -AT_CHECK(test -f MT/log -a ! -s MT/log) +AT_CHECK(test -f _MTN/log -a ! -s _MTN/log) AT_CLEANUP ============================================================ --- tests/t_setup_existing_path.at ce17bd423597f38adb7065e230cc73e226aebfeb +++ tests/t_setup_existing_path.at 7b4b33c2ed726cbf00a4e38fbd7696baa8038b58 @@ -6,8 +6,8 @@ AT_CHECK(MONOTONE setup --branch=testbranch foo, [1], [ignore], [ignore]) AT_CHECK(mkdir bar) AT_CHECK(MONOTONE setup --branch=testbranch bar, [], [ignore], [ignore]) -AT_CHECK(test -d bar/MT) -AT_CHECK(rm -r bar/MT) +AT_CHECK(test -d bar/_MTN) +AT_CHECK(rm -r bar/_MTN) AT_CHECK(cd bar && MONOTONE setup --branch=testbranch, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_short_opts.at f633e5c60ec847a5b9cc42643e1be2d6c89788bd +++ tests/t_short_opts.at 1457b0b8dc5ff7391d34f4c09eaa70f75a56a3e4 @@ -21,7 +21,7 @@ AT_CHECK(SHORT_MONOTONE -k address@hidden -b test.branch commit -d test.db -m happy, [1], [ignore], [ignore]) # the failed log will have been saved -AT_CHECK(rm MT/log) +AT_CHECK(rm _MTN/log) # and it does work with a key AT_CHECK(SHORT_MONOTONE -k address@hidden -b test.branch commit -d test.db -m happy, [], [ignore], [ignore]) ============================================================ --- tests/t_single_char_filenames.at f4492e7c63d5f93094d8f2bdea04d80854b41b31 +++ tests/t_single_char_filenames.at aeeaf4693e0414db9c0f512a3ec07888ab5d04e8 @@ -24,17 +24,17 @@ AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) NULL_R_SHA1=`BASE_REVISION` -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE checkout --revision=$A_R_SHA1 a-dir, [], [ignore], [ignore]) AT_CHECK(test -e a-dir/a, [], [ignore]) AT_CHECK(test ! -e a-dir/b, [], [ignore]) -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE checkout --revision=$B_R_SHA1 b-dir, [], [ignore], [ignore]) AT_CHECK(test ! -e b-dir/a, [], [ignore]) AT_CHECK(test -e b-dir/b, [], [ignore]) -AT_CHECK(rm -rf MT) +AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE checkout --revision=$NULL_R_SHA1 null-dir, [], [ignore], [ignore]) AT_CHECK(test ! -e null-dir/a, [], [ignore]) AT_CHECK(test ! -e null-dir/b, [], [ignore]) ============================================================ --- tests/t_sink_has_extra_epochs.at 0b9d5574dc645aac752334bf8d915551faf43faa +++ tests/t_sink_has_extra_epochs.at 1476ccf22fb668341183462217d355e0b075d35f @@ -17,7 +17,7 @@ ]) COMMIT(testbranch) AT_CHECK(MONOTONE db set_epoch testbranch 1234567890123456789009876543210987654321) -AT_CHECK(rm -r MT/) +AT_CHECK(rm -r _MTN/) AT_CHECK(MONOTONE2 setup -b otherbranch ., [], [ignore], [ignore]) AT_DATA(bar, [bar ]) ============================================================ --- tests/t_tags.at 8b32ae2dbacb65d3e1071cdf9aaafa1caf521940 +++ tests/t_tags.at f8ebf7132751a4bf8d4ae4ed58384095e30d9cae @@ -46,7 +46,7 @@ AT_CHECK(sort sorted-stdout) AT_CHECK(cmp stdout sorted-stdout) -AT_CHECK(rm -rf MT file1 file2 file3) +AT_CHECK(rm -rf _MTN file1 file2 file3) AT_CHECK(MONOTONE co --revision=tag1 ., [], [ignore], [ignore]) TAG1=`BASE_REVISION` @@ -55,7 +55,7 @@ AT_CHECK(test -e file2, [1], [ignore], [ignore]) AT_CHECK(test -e file3, [1], [ignore], [ignore]) -AT_CHECK(rm -rf MT file1 file2 file3) +AT_CHECK(rm -rf _MTN file1 file2 file3) AT_CHECK(MONOTONE co --revision=tag2 ., [], [ignore], [ignore]) TAG2=`BASE_REVISION` @@ -64,7 +64,7 @@ AT_CHECK(test -e file2, [0], [ignore], [ignore]) AT_CHECK(test -e file3, [1], [ignore], [ignore]) -AT_CHECK(rm -rf MT file1 file2 file3) +AT_CHECK(rm -rf _MTN file1 file2 file3) AT_CHECK(MONOTONE co --revision=tag3 ., [], [ignore], [ignore]) TAG3=`BASE_REVISION` ============================================================ --- tests/t_undo_update.at 23512408a71b29946fbeb5b1d5058c6a5f9abd87 +++ tests/t_undo_update.at 622c5975b220b26bf1815ec3eb9a680ad420ab5a @@ -9,7 +9,7 @@ # # This wouldn't be that hard to do -- before starting an update, make # a note of all file modifications being applied, and save copies of -# them somewhere under MT/. The only tricky part is making sure we +# them somewhere under _MTN/. The only tricky part is making sure we # can undo tree rearrangements. # # For bonus points, use this to implement "workspace rollback" -- ============================================================ --- tests/t_unreadable_MT.at d732c69dc8d90926de48dd11938a48b436265012 +++ tests/t_unreadable_MT.at 1b4a381cf098a344f3a81ec1aefec35580afb7f8 @@ -1,17 +1,17 @@ # -*- Autoconf -*- -AT_SETUP([fail cleanly on unreadable MT/options]) +AT_SETUP([fail cleanly on unreadable _MTN/options]) # disable for now; can't see a sane way to test this NOT_ON_WIN32 MONOTONE_SETUP -AT_CHECK(chmod a-rwx MT/) +AT_CHECK(chmod a-rwx _MTN/) AT_CHECK(monotone --norc, [1], [ignore], [ignore]) AT_CHECK(monotone, [1], [ignore], [ignore]) -AT_CHECK(chmod u+rwx MT/) +AT_CHECK(chmod u+rwx _MTN/) AT_CLEANUP ============================================================ --- tests/t_update_branch.at b6390318109dc91675aa8a174de4a911cf9c8618 +++ tests/t_update_branch.at 33934ce6e4ef6bde1c5ccce8417cc1e7fe750224 @@ -1,4 +1,4 @@ -AT_SETUP([update -b foo updates MT/options correctly]) +AT_SETUP([update -b foo updates _MTN/options correctly]) MONOTONE_SETUP ADD_FILE(testfile, [blah blah @@ -12,17 +12,17 @@ # This update should fail (because not only does it have no update # candidate, but it's currently at an off-branch revision); and should -# not update the MT/options +# not update the _MTN/options AT_CHECK(MONOTONE update -b testbranch, [1], [ignore], [ignore]) -AT_CHECK(QGREP(otherbranch MT/options), []) -AT_CHECK(QGREP(testbranch MT/options), [1]) +AT_CHECK(QGREP(otherbranch _MTN/options), []) +AT_CHECK(QGREP(testbranch _MTN/options), [1]) REVERT_TO($REV, testbranch) -AT_CHECK(QGREP(otherbranch MT/options), [1]) -AT_CHECK(QGREP(testbranch MT/options), []) +AT_CHECK(QGREP(otherbranch _MTN/options), [1]) +AT_CHECK(QGREP(testbranch _MTN/options), []) AT_CHECK(MONOTONE update -b otherbranch, [], [ignore], [ignore]) -AT_CHECK(QGREP(otherbranch MT/options), []) -AT_CHECK(QGREP(testbranch MT/options), [1]) +AT_CHECK(QGREP(otherbranch _MTN/options), []) +AT_CHECK(QGREP(testbranch _MTN/options), [1]) AT_CLEANUP ============================================================ --- tests/t_update_inodeprints.at 8e9ec9723a232850248e679a59a28c8ec043f3e9 +++ tests/t_update_inodeprints.at 7918726b22ac7cac356448a1a9df80dd4afbe597 @@ -5,10 +5,10 @@ ]) COMMIT(testbranch) -AT_CHECK(test -e MT/inodeprints, [1]) +AT_CHECK(test -e _MTN/inodeprints, [1]) AT_CHECK(MONOTONE update_inodeprints) -AT_CHECK(test -s MT/inodeprints) +AT_CHECK(test -s _MTN/inodeprints) AT_CLEANUP ============================================================ --- tests/t_update_off_branch.at 0a795cf6e182e2f8f2f5a9bea020b96177c4d3a0 +++ tests/t_update_off_branch.at b9d36236416ad78ec83e04ad96bb342839ffff8b @@ -13,6 +13,6 @@ AT_CHECK(MONOTONE checkout --branch=testbranch --revision=$TR codir, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE update --revision=$OR, [], [ignore], [ignore]) -AT_CHECK(grep '^ *branch "otherbranch"' MT/options, [], [ignore], [ignore]) +AT_CHECK(grep '^ *branch "otherbranch"' _MTN/options, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_switch_branch.at 671401ca3e91c9879e3fdf48443960361d97d63b +++ tests/t_update_switch_branch.at 4dc9c4e7562dded128cca9b56ffb72398c4b6e42 @@ -9,14 +9,14 @@ AT_CHECK(MONOTONE cert $RID1 branch otherbranch, [], [ignore], [ignore]) -AT_CHECK(QGREP(testbranch MT/options)) -AT_CHECK(QGREP(otherbranch MT/options), [1]) +AT_CHECK(QGREP(testbranch _MTN/options)) +AT_CHECK(QGREP(otherbranch _MTN/options), [1]) AT_CHECK(MONOTONE update -b otherbranch, [], [ignore], [ignore]) RID2=`BASE_REVISION` AT_CHECK(test "$RID1" = "$RID2") -AT_CHECK(QGREP(testbranch MT/options), [1]) -AT_CHECK(QGREP(otherbranch MT/options)) +AT_CHECK(QGREP(testbranch _MTN/options), [1]) +AT_CHECK(QGREP(otherbranch _MTN/options)) AT_CLEANUP ============================================================ --- tests/t_update_with_blocked_rename.at dc86b21bd469bee17cb8df586f108a13a4a191be +++ tests/t_update_with_blocked_rename.at ec11f3c0fdf105effa16659c990631bbab76cc18 @@ -10,7 +10,7 @@ # 4. Alice renames one of her files to bar # 5. Bob updates # -# the update fails after moving renamed files to MT/tmp/N +# the update fails after moving renamed files to _MTN/tmp/N # where N is the file's tid. # # Bob is left with a bunch of missing files. ============================================================ --- tests/t_update_with_pending_add.at af1ac1b21a52bade76fa8fa92cae2c5be1a18321 +++ tests/t_update_with_pending_add.at 191a9bb03fe47fd446be8475be0b38c076b23851 @@ -26,7 +26,7 @@ # make sure there are no changes in the workspace -AT_CHECK(test ! -e codir/MT/work, [], [ignore], [ignore]) +AT_CHECK(test ! -e codir/_MTN/work, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE diff, [], [stdout], [ignore]) AT_CHECK(grep 'no changes' stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_update_with_pending_drop.at 04407e4305991ff2358e52325d584674e8f0fcd2 +++ tests/t_update_with_pending_drop.at 74cf8a3d47adaf7a50ed7b2488b39f0ae8039268 @@ -25,7 +25,7 @@ # make sure there are no changes in the workspace -AT_CHECK(test ! -e codir/MT/work, [], [ignore], [ignore]) +AT_CHECK(test ! -e codir/_MTN/work, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE diff, [], [stdout], [ignore]) AT_CHECK(grep 'no changes' stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_update_with_pending_rename.at 2577008031f11dbdeaceeda708d4238b5b52c641 +++ tests/t_update_with_pending_rename.at da0deb279259309a94cd9838544b92ba8457b3df @@ -26,7 +26,7 @@ # make sure there are no changes in the workspace -AT_CHECK(test ! -e codir/MT/work, [], [ignore], [ignore]) +AT_CHECK(test ! -e codir/_MTN/work, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE diff, [], [stdout], [ignore]) AT_CHECK(grep 'no changes' stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_versions.at 49105adca6a5a867ec44be87731651eacb8cb437 +++ tests/t_versions.at dad3fbfa60f5c9ae1f74fc7aac7913c655903a54 @@ -32,7 +32,7 @@ AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout testfile, [], [ignore]) - AT_CHECK(rm -rf MT) + AT_CHECK(rm -rf _MTN) AT_CHECK(MONOTONE checkout --revision=$RSHA ., [], [stdout]) AT_CHECK(SHA1(testfile), [], [stdout]) AT_CHECK(cmp stdout fsha-$i, [], [ignore])