# # patch "ChangeLog" # from [12a609f7eb7b260bf078fa0cd77e06534e63dc51] # to [b27724dad95649435bee7ecbc15b9721e414769c] # # patch "commands.cc" # from [c6c61b328de94ab9ec9f9c089c5ff8e1f9840951] # to [76f0fb24681d29b16c1bbde305b53763c617a86e] # # patch "monotone.texi" # from [3abc599a9ba2f2739baafe5c4b147f7253488761] # to [3f70831b8aa51f91d3cb75fb9024756dbaea0ced] # # patch "tests/t_add_dot.at" # from [f7f04114039217d33e5b589f8daaf926aed40a03] # to [70227719dce0b158824f846a8f7a529a7f85dced] # # patch "tests/t_annotate_branch_collision.at" # from [9109836cbf4011c18f3f9645894c2b72acd5690b] # to [261f44d7235b02fd6e7cdcbae76866f5ab60ff81] # # patch "tests/t_commit_message_file.at" # from [aa49a6a98a40d510813800cd39cf9ae399bef4ed] # to [447a09a7a56815e3298f30a6c84a89882340c029] # # patch "tests/t_db_with_dots.at" # from [0d250a8d8d44ce0a4edd501284c2d1875df03be3] # to [69973200a20d087bb2701a5c5e8c927ae54e53d2] # # patch "tests/t_empty_path.at" # from [c3c5137146a20ad3dd354795f69b8732822f5753] # to [69085e1806dff5b9884401f0c64e02477f5a8b14] # # patch "tests/t_epoch_unidirectional.at" # from [5b50d219fc0b011f307d074ab09336f98c121c65] # to [8a53bc343a7e48d20843b89a6e77c208de84c38c] # # patch "tests/t_existsonpath.at" # from [fc7253fa711c37e25ffdd8e0aa90a631286926f5] # to [4f555bc7a0c0f3d218a445d3fb78cdcf57147345] # # patch "tests/t_inodeprints_hook.at" # from [eb998935bdbf72c58d8811a635c4609680e450c1] # to [9ba633b9cd6acf2c4c7630336f4f9755e14a86ef] # # patch "tests/t_lua_includedir.at" # from [06e756a957d1d330d347970c0c32def0936c7702] # to [cfb180197cc358a2d4bf71385fa0fdc1b53058ed] # # patch "tests/t_merge2_add.at" # from [a36d4d07a745cfbbf45ef17be18bdc0b55b77c42] # to [5bd5c17172e802ab24a998462fd0dc1738b0716a] # # patch "tests/t_merge2_data.at" # from [4325798fac860cb6563fc1de63d1570d16a2fa1e] # to [198ef24b2d4ec9dfa4ba2328c403a832c7cfa4c2] # # patch "tests/t_netsync_globs.at" # from [3dff1121e0e6897d4f16ed9141253806e5b65939] # to [0a8790052bf9a94b4a47f8c6e64a2aa98de4649a] # # patch "tests/t_netsync_unrelated.at" # from [bdd90ebe0b092465055b16fff07ccdfe75b8f7a0] # to [b8f19e4d89439d8ab409731dbc5361099ae450e7] # # patch "tests/t_persistent_server_revision.at" # from [8418111484ba4aaf797db3626a697ec88f4d0f88] # to [3462ba494a0efb9890baf14f1aed76e53b435967] # # patch "tests/t_rcfile_dir.at" # from [ef248856acc3362e65a272c54c8ce0131c3aae0f] # to [f9aa64b4b4df88b80587b24a87f1d77408a7b576] # # patch "tests/t_setup_existing_path.at" # from [65ed903effa04ed5e70989bf0bfd4b1938e6878f] # to [99dafd7dfe5e96f5bf941462c16e4352de49bef8] # # patch "tests/t_sticky_branch.at" # from [383e882866f67eec58c597b01605cf8233061ff0] # to [452ed835d2e831480a7fff9ef2c8b5c539bcbf85] # # patch "testsuite.at" # from [3069578e5268491a6c837912613346860e6f7ea5] # to [752c4e1a21c136cce54e6151aa1ecae06ac226ae] # ======================================================================== --- ChangeLog 12a609f7eb7b260bf078fa0cd77e06534e63dc51 +++ ChangeLog b27724dad95649435bee7ecbc15b9721e414769c @@ -1,3 +1,13 @@ +2005-09-01 Matthew Gregan + + * monotone.texi: Update 'setup' documentation and tutorial to + reflect new usage. Also update much of the monotone output in the + tutorials to reflect the output of more modern versions of + monotone. Correct some minor errors and typos while here. + * commands.cc (CMD(setup)): Require database and branch arguments. + (ALIAS(import,setup)): Add setup alias. + * testsuite.at, tests/*.at: Update 'setup' usage. + 2005-08-31 Richard Levitte * lua.cc, std_hooks.lua: Rename monotone_guess_binary_filename_for_lua ======================================================================== --- commands.cc c6c61b328de94ab9ec9f9c089c5ff8e1f9840951 +++ commands.cc 76f0fb24681d29b16c1bbde305b53763c617a86e @@ -3716,21 +3716,23 @@ } } - CMD(setup, N_("tree"), N_("DIRECTORY"), N_("setup a new working copy directory"), OPT_BRANCH_NAME) { - string dir; - if (args.size() != 1) throw usage(name); - dir = idx(args,0)(); + N(!app.branch_name().empty(), F("need --branch argument for setup")); + app.db.ensure_open(); + + string dir = idx(args,0)(); app.create_working_copy(dir); revision_id null; put_revision_id(null); } +ALIAS(import, setup); + CMD(automate, N_("automation"), N_("interface_version\n" "heads [BRANCH]\n" ======================================================================== --- monotone.texi 3abc599a9ba2f2739baafe5c4b147f7253488761 +++ monotone.texi 3f70831b8aa51f91d3cb75fb9024756dbaea0ced @@ -1145,8 +1145,9 @@ @smallexample @group $ monotone --db=~/jim.db genkey jim@@juicebot.co.jp +monotone: generating key-pair 'jim@@juicebot.co.jp' enter passphrase for key ID [jim@@juicebot.co.jp] : @i{} -monotone: generating key-pair 'jim@@juicebot.co.jp' +confirm passphrase for key ID [jim@@juicebot.co.jp]: @i{} monotone: storing key-pair 'jim@@juicebot.co.jp' in database @end group @end smallexample @@ -1156,8 +1157,9 @@ @smallexample @group $ monotone --db=~/abe.db genkey abe@@juicebot.co.jp +monotone: generating key-pair 'abe@@juicebot.co.jp' enter passphrase for key ID [abe@@juicebot.co.jp] : @i{} -monotone: generating key-pair 'abe@@juicebot.co.jp' +confirm passphrase for key ID [abe@@juicebot.co.jp]: @i{} monotone: storing key-pair 'abe@@juicebot.co.jp' in database @end group @end smallexample @@ -1167,8 +1169,9 @@ @smallexample @group $ monotone --db=~/beth.db genkey beth@@juicebot.co.jp +monotone: generating key-pair 'beth@@juicebot.co.jp' enter passphrase for key ID [beth@@juicebot.co.jp] : @i{} -monotone: generating key-pair 'beth@@juicebot.co.jp' +confirm passphrase for key ID [beth@@juicebot.co.jp]: @i{} monotone: storing key-pair 'beth@@juicebot.co.jp' in database @end group @end smallexample @@ -1246,11 +1249,13 @@ @file{MT/options}, so you don't have to keep passing them to monotone all the time. -Jim creates his working copy: +He chooses @code{jp.co.juicebot.jb7} as a branch name. (See address@hidden Conventions} for more information about appropriate branch +names.) Jim then creates his working copy: @smallexample @group -/home/jim$ monotone --db=jim.db setup juice +/home/jim$ monotone --db=jim.db --branch=jp.co.juicebot.jb7 setup juice /home/jim$ cd juice /home/jim/juice$ @end group @@ -1409,8 +1414,9 @@ # from [] # to [e8f147e5b4d5667f3228b7bba1c5c1e639f5db9f] # +============================================================================ --- include/jb.h -+++ include/jb.h ++++ include/jb.h 3b12b2d0b31439bd50976633db1895cff8b19da0 @@ -0,0 +1,13 @@ +/* Standard JuiceBot hw interface */ + @@ -1425,8 +1431,9 @@ +#define BANANA_SPOUT 0x7f +void dispense_apple_juice (); +void dispense_banana_juice (); +============================================================================ --- src/apple.c -+++ src/apple.c ++++ src/apple.c 2650ffc660dd00a08b659b883b65a060cac7e560 @@ -0,0 +1,7 @@ +#include "jb.h" + @@ -1435,8 +1442,9 @@ address@hidden + /* Fill this in please, Abe. */ address@hidden +============================================================================ --- src/banana.c -+++ src/banana.c ++++ src/banana.c e8f147e5b4d5667f3228b7bba1c5c1e639f5db9f @@ -0,0 +1,7 @@ +#include "jb.h" + @@ -1452,18 +1460,17 @@ @node Committing Work @section Committing Work -Satisfied with the work he's done, Jim wants to save his changes. He -chooses @code{jp.co.juicebot.jb7} as a branch name. (See @ref{Naming -Conventions} for more information about appropriate branch names.) He +Satisfied with the work he's done, Jim wants to save his changes. He then commits his working copy, which causes monotone to process the address@hidden/work} file and record the file contents, manifest, and revision -into the database. Since he didn't give a branch when he ran address@hidden, he has to do so now; monotone will remember the branch -and re-use it for future commits automatically. address@hidden/work} file and record the file contents, manifest, and +revision into the database. Since he provided a branch name when he +ran @command{setup}, monotone will use this as the default branch name +when he commits. + @smallexample @group -$ monotone --branch=jp.co.juicebot.jb7 commit --message="initial checkin of project" +$ monotone commit --message="initial checkin of project" monotone: beginning commit on branch 'jp.co.juicebot.jb7' monotone: committed revision 2e24d49a48adf9acf3a1b6391a080008cbef9c21 @end group @@ -1602,7 +1609,7 @@ @smallexample @group -$ monotone --db=~/jim.db read ~/abe.pubkey ~/beth.pubkey +$ cat ~/abe.pubkey ~/beth.pubkey | monotone --db=~/jim.db read monotone: read 2 packets @end group @end smallexample @@ -1652,9 +1659,17 @@ @smallexample @group monotone --db=abe.db sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7*" -monotone: rebuilding merkle trees ... +monotone: setting default server to jim-laptop.juicebot.co.jp +monotone: setting default branch include pattern to 'jp.co.juicebot.jb7*' +monotone: setting default branch exclude pattern to '' monotone: connecting to jim-laptop.juicebot.co.jp -monotone: [bytes in: 3200] [bytes out: 673] +monotone: first time connecting to server jim-laptop.juicebot.co.jp:5253 +monotone: I'll assume it's really them, but you might want to double-check +monotone: their key's fingerprint: 9e9e9ef1d515ad58bfaa5cf282b4a872d8fda00c +monotone: warning: saving public key for jim@@juicebot.co.jp to database +monotone: finding items to synchronize: +monotone: bytes in | bytes out | revs in | revs out | revs written +monotone: 2587 | 1025 | 1 | 0 | 1 monotone: successful exchange with jim-laptop.juicebot.co.jp @end group @end smallexample @@ -1726,8 +1741,9 @@ # from [2650ffc660dd00a08b659b883b65a060cac7e560] # to [e2c418703c863eabe70f9bde988765406f885fd0] # ---- src/apple.c -+++ src/apple.c +============================================================================ +--- src/apple.c 2650ffc660dd00a08b659b883b65a060cac7e560 ++++ src/apple.c e2c418703c863eabe70f9bde988765406f885fd0 @@ -1,7 +1,10 @@ #include "jb.h" @@ -1749,7 +1765,6 @@ @group $ monotone commit monotone: beginning commit on branch 'jp.co.juicebot.jb7' -monotone: commited revision 70decb4b31a8227a629c0e364495286c5c75f979 @end group @end smallexample @@ -1797,12 +1812,13 @@ @smallexample @group -$ monotone sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7*" -monotone: rebuilding merkle trees ... -monotone: including branch jp.co.juicebot.jb7 -monotone: [keys: 2] [rcerts: 8] +$ monotone sync monotone: connecting to jim-laptop.juicebot.co.jp -monotone: [bytes in: 630] [bytes out: 2844] +monotone: finding items to synchronize: +monotone: certs | keys | revisions +monotone: 8 | 2 | 2 +monotone: bytes in | bytes out | revs in | revs out | revs written +monotone: 615 | 2822 | 0 | 1 | 0 monotone: successful exchange with jim-laptop.juicebot.co.jp @end group @end smallexample @@ -1813,9 +1829,20 @@ @smallexample @group $ monotone --db=beth.db sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7*" -monotone: rebuilding merkle trees ... +monotone: setting default server to jim-laptop.juicebot.co.jp +monotone: setting default branch include pattern to 'jp.co.juicebot.jb7*' +monotone: setting default branch exclude pattern to '' monotone: connecting to jim-laptop.juicebot.co.jp -monotone: [bytes in: 3200] [bytes out: 673] +monotone: first time connecting to server jim-laptop.juicebot.co.jp:5253 +monotone: I'll assume it's really them, but you might want to double-check +monotone: their key's fingerprint: 9e9e9ef1d515ad58bfaa5cf282b4a872d8fda00c +monotone: warning: saving public key for jim@@juicebot.co.jp to database +monotone: finding items to synchronize: +monotone: bytes in | bytes out | revs in | revs out | revs written +monotone: 4601 | 1239 | 2 | 0 | 1 +monotone: verifying new revisions (this may take a while) +monotone: bytes in | bytes out | revs in | revs out | revs written +monotone: 4601 | 1285 | 2 | 0 | 2 monotone: successful exchange with jim-laptop.juicebot.co.jp @end group @end smallexample @@ -1864,12 +1891,14 @@ @smallexample @group -$ monotone sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7*" -monotone: rebuilding merkle trees ... -monotone: including branch jp.co.juicebot.jb7 -monotone: [keys: 3] [rcerts: 12] +$ monotone sync + monotone: connecting to jim-laptop.juicebot.co.jp -monotone: [bytes in: 630] [bytes out: 2844] +monotone: finding items to synchronize: +monotone: certs | keys | revisions +monotone: 12 | 3 | 3 +monotone: bytes in | bytes out | revs in | revs out | revs written +monotone: 709 | 2879 | 0 | 1 | 0 monotone: successful exchange with jim-laptop.juicebot.co.jp @end group @end smallexample @@ -1940,8 +1969,9 @@ # from [7381d6b3adfddaf16dc0fdb05e0f2d1873e3132a] # to [5e6622cf5c8805bcbd50921ce7db86dad40f2ec6] # ---- src/banana.c -+++ src/banana.c +============================================================================ +--- src/banana.c 7381d6b3adfddaf16dc0fdb05e0f2d1873e3132a ++++ src/banana.c 5e6622cf5c8805bcbd50921ce7db86dad40f2ec6 @@ -1,10 +1,15 @@ #include "jb.h" @@ -1979,7 +2009,7 @@ @smallexample @group -$ monotone sync jim-laptop.juicebot.co.jp jp.co.juicebot.jb7 +$ monotone sync @end group @end smallexample @@ -2010,7 +2040,7 @@ @smallexample @group -$ monotone sync jim-laptop.juicebot.co.jp jp.co.juicebot.jb7 +$ monotone sync @end group @end smallexample @@ -2036,10 +2066,11 @@ @smallexample @group $ monotone merge -monotone: merging with revision 1 / 2 +monotone: starting with revision 1 / 2 +monotone: merging with revision 2 / 2 monotone: [source] 39969614e5a14316c7ffefc588771f491c709152 monotone: [source] 8b41b5399a564494993063287a737d26ede3dee4 -monotone: common ancestor 70decb4b31a8227a629c0e364495286c5c75f979 found +monotone: common ancestor 70decb4b31a8227a629c0e364495286c5c75f979 abe@@juicebot.co.jp 2004-10-26T:02:50:01 found monotone: trying 3-way merge monotone: [merged] da499b9d9465a0e003a4c6b2909102ef98bf4e6d monotone: your working copies have not been updated @@ -2156,7 +2187,9 @@ monotone: propagating jp.co.juicebot.jb7 -> jp.co.juicebot.jb7.muffins monotone: [source] da003f115752ac6e4750b89aaca9dbba178ac80c monotone: [target] d0e5c93bb61e5fd25a0dadf41426f209b73f40af -monotone: common ancestor 853b8c7ac5689181d4b958504adfb5d07fd959ab found +monotone: common ancestor 853b8c7ac5689181d4b958504adfb5d07fd959ab jim@@juicebot.co.jp 2004-10-26T:12:44:23 found +monotone: trying 3-way merge +monotone: [merged] 89585b3c5e51a5a75f5d1a05dda859c5b7dde52f @end group @end smallexample @@ -2164,15 +2197,16 @@ another. When the muffins code is eventually stable and ready to be integrated -into the main line of development, she simple propagates the other way: +into the main line of development, she simply propagates the other way: @smallexample @group $ monotone propagate jp.co.juicebot.jb7.muffins jp.co.juicebot.jb7 -monotone: propagating jp.co.juicebot.jb7 -> jp.co.juicebot.jb7.muffins +monotone: propagating jp.co.juicebot.jb7.muffins -> jp.co.juicebot.jb7 monotone: [source] 4e48e2c9a3d2ca8a708cb0cc545700544efb5021 monotone: [target] bd29b2bfd07644ab370f50e0d68f26dcfd3bb4af -monotone: common ancestor 652b1035343281a0d2a5de79919f9a31a30c9028 found +monotone: common ancestor 652b1035343281a0d2a5de79919f9a31a30c9028 jim@@juicebot.co.jp 2004-10-26T:15:25:05 found +monotone: [merged] 03f7495b51cc70b76872ed019d19dee1b73e89b6 @end group @end smallexample ======================================================================== --- tests/t_add_dot.at f7f04114039217d33e5b589f8daaf926aed40a03 +++ tests/t_add_dot.at 70227719dce0b158824f846a8f7a529a7f85dced @@ -13,13 +13,13 @@ AT_DATA(subdir/testdir1/subfile2, [quux ]) -AT_CHECK(MONOTONE setup subdir, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch subdir, [], [ignore], [ignore]) # Make sure that "add ." works, even at the root of the tree AT_CHECK(cd subdir && MONOTONE add ., [], [ignore], [ignore]) # Make sure that it took -AT_CHECK(cd subdir && MONOTONE commit --message="foo" --branch=testbranch, [], [ignore], [ignore]) +AT_CHECK(cd subdir && MONOTONE commit --message="foo", [], [ignore], [ignore]) AT_CHECK(rm subdir/testfile1) AT_CHECK(rm subdir/testfile2) ======================================================================== --- tests/t_annotate_branch_collision.at 9109836cbf4011c18f3f9645894c2b72acd5690b +++ tests/t_annotate_branch_collision.at 261f44d7235b02fd6e7cdcbae76866f5ab60ff81 @@ -26,7 +26,7 @@ REVL=`BASE_REVISION` AT_CHECK(rm -r -f MT foo) -AT_CHECK(MONOTONE setup .) +AT_CHECK(MONOTONE setup --branch=testbranch .) AT_CHECK(cp foo.right foo) AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) ======================================================================== --- tests/t_commit_message_file.at aa49a6a98a40d510813800cd39cf9ae399bef4ed +++ tests/t_commit_message_file.at 447a09a7a56815e3298f30a6c84a89882340c029 @@ -25,7 +25,7 @@ #-------------------- #also with a file coming outside the working copy #-------------------- -AT_CHECK(MONOTONE setup alt_wrk, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) AT_DATA(alt_wrk/input1.txt, [files... files... ]) ======================================================================== --- tests/t_db_with_dots.at 0d250a8d8d44ce0a4edd501284c2d1875df03be3 +++ tests/t_db_with_dots.at 69973200a20d087bb2701a5c5e8c927ae54e53d2 @@ -8,7 +8,7 @@ # paths in MT/options should be absolute and not contain .. AT_CHECK(mkdir bar) -AT_CHECK( (cd bar && MONOTONE --db=../new.db setup .), [], [ignore], [ignore]) +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]) ======================================================================== --- tests/t_empty_path.at c3c5137146a20ad3dd354795f69b8732822f5753 +++ tests/t_empty_path.at 69085e1806dff5b9884401f0c64e02477f5a8b14 @@ -7,7 +7,7 @@ REV0=`BASE_REVISION` AT_CHECK(mkdir foo) -AT_CHECK(cd foo && MONOTONE setup "", [1], [ignore], [ignore]) +AT_CHECK(cd foo && MONOTONE setup --branch=testbranch "", [1], [ignore], [ignore]) AT_CHECK(cd foo && MONOTONE checkout --revision=$REV0 "", [1], [ignore], [ignore]) AT_CHECK(cd foo && MONOTONE checkout --branch=testbranch "", [1], [ignore], [ignore]) ======================================================================== --- tests/t_epoch_unidirectional.at 5b50d219fc0b011f307d074ab09336f98c121c65 +++ tests/t_epoch_unidirectional.at 8a53bc343a7e48d20843b89a6e77c208de84c38c @@ -11,7 +11,7 @@ COMMIT(testbranch) AT_CHECK(rm -rf MT) -AT_CHECK(MONOTONE2 setup .) +AT_CHECK(MONOTONE2 setup --branch=testbranch .) AT_DATA(otherfile, [some data ]) AT_CHECK(MONOTONE2 add testfile, [], [ignore], [ignore]) ======================================================================== --- tests/t_existsonpath.at fc7253fa711c37e25ffdd8e0aa90a631286926f5 +++ tests/t_existsonpath.at 4f555bc7a0c0f3d218a445d3fb78cdcf57147345 @@ -15,7 +15,7 @@ return false end ]) -AT_CHECK(MONOTONE setup --rcfile=test.lua subdir, [], [stdout], [ignore]) +AT_CHECK(MONOTONE setup --rcfile=test.lua --branch=testbranch subdir, [], [stdout], [ignore]) AT_CHECK(QGREP(asdfghjkl stdout), []) AT_CHECK(QGREP(qwertyuiop stdout), []) ======================================================================== --- tests/t_inodeprints_hook.at eb998935bdbf72c58d8811a635c4609680e450c1 +++ tests/t_inodeprints_hook.at 9ba633b9cd6acf2c4c7630336f4f9755e14a86ef @@ -19,17 +19,17 @@ COMMIT(testbranch) REV=`BASE_REVISION` -AT_CHECK(MONOTONE setup setup_default, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch setup_default, [], [ignore], [ignore]) AT_CHECK(test ! -e setup_default/MT/inodeprints) AT_CHECK(MONOTONE checkout --revision=$REV co_default, [], [ignore], [ignore]) AT_CHECK(test ! -e co_default/MT/inodeprints) -AT_CHECK(MONOTONE --rcfile=off.lua setup setup_off, [], [ignore], [ignore]) +AT_CHECK(MONOTONE --rcfile=off.lua setup --branch=testbranch setup_off, [], [ignore], [ignore]) AT_CHECK(test ! -e setup_off/MT/inodeprints) AT_CHECK(MONOTONE --rcfile=off.lua checkout --revision=$REV co_off, [], [ignore], [ignore]) AT_CHECK(test ! -e co_off/MT/inodeprints) -AT_CHECK(MONOTONE --rcfile=on.lua setup setup_on, [], [ignore], [ignore]) +AT_CHECK(MONOTONE --rcfile=on.lua setup --branch=testbranch setup_on, [], [ignore], [ignore]) AT_CHECK(test -e setup_on/MT/inodeprints) AT_CHECK(MONOTONE --rcfile=on.lua checkout --revision=$REV co_on, [], [ignore], [ignore]) AT_CHECK(test -e co_on/MT/inodeprints) ======================================================================== --- tests/t_lua_includedir.at 06e756a957d1d330d347970c0c32def0936c7702 +++ tests/t_lua_includedir.at cfb180197cc358a2d4bf71385fa0fdc1b53058ed @@ -22,7 +22,7 @@ ]) # setup a wrk dir -AT_CHECK(MONOTONE setup alt_wrk, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) # include directly a single file AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../include.lua status, [], [stdout], [ignore]) @@ -32,7 +32,7 @@ AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../includedir.lua status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGACICCA CICCA" stdout)) -# write a third file: should be read beetween the two previous ones +# write a third file: should be read between the two previous ones AT_DATA(gongolo/aba.rc, [function notwowithoutthree() io.write("hu hu") end ======================================================================== --- tests/t_merge2_add.at a36d4d07a745cfbbf45ef17be18bdc0b55b77c42 +++ tests/t_merge2_add.at 5bd5c17172e802ab24a998462fd0dc1738b0716a @@ -7,7 +7,7 @@ LEFT=`BASE_REVISION` AT_CHECK(rm -rf MT) -AT_CHECK(MONOTONE setup .) +AT_CHECK(MONOTONE setup --branch=testbranch .) ADD_FILE(testfile2, [This is test file 2 ]) ======================================================================== --- tests/t_merge2_data.at 4325798fac860cb6563fc1de63d1570d16a2fa1e +++ tests/t_merge2_data.at 198ef24b2d4ec9dfa4ba2328c403a832c7cfa4c2 @@ -18,7 +18,7 @@ LEFT=`BASE_REVISION` AT_CHECK(rm -rf MT) -AT_CHECK(MONOTONE setup .) +AT_CHECK(MONOTONE setup --branch=testbranch .) AT_CHECK(cp -f right testfile) AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) ======================================================================== --- tests/t_netsync_globs.at 3dff1121e0e6897d4f16ed9141253806e5b65939 +++ tests/t_netsync_globs.at 0a8790052bf9a94b4a47f8c6e64a2aa98de4649a @@ -8,14 +8,14 @@ REV11=`BASE_REVISION` AT_CHECK(rm -rf MT) -AT_CHECK(MONOTONE setup .) +AT_CHECK(MONOTONE setup --branch=testbranch .) ADD_FILE(testfile, [bar ]) COMMIT(1branch2) REV12=`BASE_REVISION` AT_CHECK(rm -rf MT) -AT_CHECK(MONOTONE setup .) +AT_CHECK(MONOTONE setup --branch=testbranch .) ADD_FILE(testfile, [baz ]) COMMIT(2branch1) ======================================================================== --- tests/t_netsync_unrelated.at bdd90ebe0b092465055b16fff07ccdfe75b8f7a0 +++ tests/t_netsync_unrelated.at b8f19e4d89439d8ab409731dbc5361099ae450e7 @@ -32,7 +32,7 @@ CHECK_SAME_STDOUT(MONOTONE ls certs $BASE, MONOTONE ls certs $BASE) AT_CHECK(rm -rf MT) -AT_CHECK(MONOTONE setup ., [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch., [], [ignore], [ignore]) ADD_FILE(testfile2, [This is test file 2 ]) ======================================================================== --- tests/t_persistent_server_revision.at 8418111484ba4aaf797db3626a697ec88f4d0f88 +++ tests/t_persistent_server_revision.at 3462ba494a0efb9890baf14f1aed76e53b435967 @@ -15,7 +15,7 @@ AT_DATA(otherfile, [stuff stuff nonsense ]) -AT_CHECK(MONOTONE3 setup ., [], [ignore], [ignore]) +AT_CHECK(MONOTONE3 setup --branch=testbranch ., [], [ignore], [ignore]) AT_CHECK(MONOTONE3 add otherfile, [], [ignore], [ignore]) AT_CHECK(MONOTONE3 commit --branch=testbranch --message foo, [], [ignore], [ignore]) REV2=`BASE_REVISION` ======================================================================== --- tests/t_rcfile_dir.at ef248856acc3362e65a272c54c8ce0131c3aae0f +++ tests/t_rcfile_dir.at f9aa64b4b4df88b80587b24a87f1d77408a7b576 @@ -16,7 +16,7 @@ ]) # note: rcfile is placed outside workdir -AT_CHECK(MONOTONE setup alt_wrk, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../gongolo status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGACICCA CICCA" stdout)) ======================================================================== --- tests/t_setup_existing_path.at 65ed903effa04ed5e70989bf0bfd4b1938e6878f +++ tests/t_setup_existing_path.at 99dafd7dfe5e96f5bf941462c16e4352de49bef8 @@ -1,11 +1,11 @@ AT_SETUP([setup on existing path]) MONOTONE_SETUP AT_DATA(foo, [blah blah ]) -AT_CHECK(MONOTONE setup foo, [1], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch foo, [1], [ignore], [ignore]) AT_CHECK(mkdir bar) -AT_CHECK(MONOTONE setup bar, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch bar, [], [ignore], [ignore]) AT_CHECK(test -d bar/MT) AT_CLEANUP ======================================================================== --- tests/t_sticky_branch.at 383e882866f67eec58c597b01605cf8233061ff0 +++ tests/t_sticky_branch.at 452ed835d2e831480a7fff9ef2c8b5c539bcbf85 @@ -47,12 +47,12 @@ AT_CHECK(cmp otherdir/foo updir/foo) # merge doesn't affect given branch -AT_CHECK(MONOTONE setup third1, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch third1, [], [ignore], [ignore]) AT_DATA(third1/a, [1a ]) AT_CHECK(cd third1 && MONOTONE add a, [], [ignore], [ignore]) AT_CHECK(cd third1 && MONOTONE commit --branch=third --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE setup third2, [], [ignore], [ignore]) +AT_CHECK(MONOTONE setup --branch=testbranch third2, [], [ignore], [ignore]) AT_DATA(third2/b, [2b ]) AT_CHECK(cd third2 && MONOTONE add b, [], [ignore], [ignore]) ======================================================================== --- testsuite.at 3069578e5268491a6c837912613346860e6f7ea5 +++ testsuite.at 752c4e1a21c136cce54e6151aa1ecae06ac226ae @@ -138,9 +138,9 @@ ]) -AT_CHECK(MONOTONE setup ., [], [ignore], [ignore]) AT_CHECK(MONOTONE db init, [], [ignore], [ignore]) AT_CHECK(MONOTONE read