# # patch "tests/t_epoch.at" # from [f49f3179bd8a59fb961258f995af2b460afb4de4] # to [868e731339f56a937d8180d2be692d8406f12056] # # patch "tests/t_epoch_server.at" # from [13e3ea41bf04d84ccfc2dcf5b6e4d6d6319c6241] # to [69e14c09d6cac20aab207cca6c92c17af5e136dc] # ======================================================================== --- tests/t_epoch.at f49f3179bd8a59fb961258f995af2b460afb4de4 +++ tests/t_epoch.at 868e731339f56a937d8180d2be692d8406f12056 @@ -37,7 +37,8 @@ VER1=`BASE_REVISION` # change the epochs in the first db -AT_CHECK(MONOTONE db rebuild, [], [ignore], [ignore]) +AT_CHECK(MONOTONE db set_epoch testbranch wooooooo, [], [ignore], [ignore]) +AT_CHECK(MONOTONE db set_epoch otherbranch wheeeeeee, [], [ignore], [ignore]) # this should *fail* to sync NETSYNC_SERVE_START(testbranch) @@ -53,9 +54,6 @@ AT_CHECK(grep testbranch stdout, [0], [ignore]) CHECK_DIFFERENT_STDOUT(MONOTONE list epochs, MONOTONE2 list epochs) -# double-check that the revisions didn't change (because otherwise our -# next test is unreliable): -AT_CHECK(MONOTONE automate get_revision $VER1, [], [ignore], [ignore]) # confirm, we did not get the new revision AT_CHECK(MONOTONE2 automate get_revision $VER1, [1], [ignore], [ignore]) ======================================================================== --- tests/t_epoch_server.at 13e3ea41bf04d84ccfc2dcf5b6e4d6d6319c6241 +++ tests/t_epoch_server.at 69e14c09d6cac20aab207cca6c92c17af5e136dc @@ -38,7 +38,8 @@ VER1=`BASE_REVISION` # change the epochs in the second db -AT_CHECK(MONOTONE2 db rebuild, [], [ignore], [ignore]) +AT_CHECK(MONOTONE db set_epoch testbranch wooooooo, [], [ignore], [ignore]) +AT_CHECK(MONOTONE db set_epoch otherbranch wheeeeeee, [], [ignore], [ignore]) # this should *fail* to sync NETSYNC_SERVE_START(testbranch) @@ -54,9 +55,6 @@ AT_CHECK(grep testbranch stdout, [0], [ignore]) CHECK_DIFFERENT_STDOUT(MONOTONE list epochs, MONOTONE2 list epochs) -# double-check that the revisions didn't change (because otherwise our -# next test is unreliable): -AT_CHECK(MONOTONE2 automate get_revision $VER1, [], [ignore], [ignore]) # confirm, we did not get the new revision AT_CHECK(MONOTONE automate get_revision $VER1, [1], [ignore], [ignore])