# # patch "tests/t_change_empty_file.at" # from [692dcb0629167d5f44981d62347bfb14b50ef9a6] # to [cef81a90be79584d5a6fb7fa2d505e5792751845] # # patch "tests/t_update_with_pending_drop.at" # from [00cdc65ce50b1b3b3c54d0542653c7ec47e27072] # to [af78561aa074371619cdcdd49ec78084dd0ecf0d] # # patch "tests/t_update_with_pending_rename.at" # from [99e70ea11a371b7b400bd8f4dd1fad467f9645e4] # to [c77760a120745388dc4fda95d8d617b7c052ce42] # ======================================================================== --- tests/t_change_empty_file.at 692dcb0629167d5f44981d62347bfb14b50ef9a6 +++ tests/t_change_empty_file.at cef81a90be79584d5a6fb7fa2d505e5792751845 @@ -16,20 +16,16 @@ AT_CHECK(MONOTONE --branch=testbranch commit --message blah, [], [ignore], [ignore]) +REV=`BASE_REVISION` + # Verify that the latest revision contains a patch, rather than a delete/add # sequence (as reported in bug #9964). -AT_DATA(expout, [new_manifest @<:@1f13fdc7b3bdef2f32f6e349a95a96dfd9fd6e82@:>@ -old_revision @<:@a227ca00ce56a54c36ca51b0e35ed4d0979da3b9@:>@ -old_manifest @<:@1a4470129e06e1786a59ab846e49881afde32c8f@:>@ - -patch "foo1" - from @<:@da39a3ee5e6b4b0d3255bfef95601890afd80709@:>@ - to @<:@b0d699dae7df285e64265ec6b46538b0ce785da0@:>@ -]) -AT_CHECK(MONOTONE automate get_revision c1dc9e4d249ac7a5f6143a87a1e90246d8be0ee5, +AT_CHECK(MONOTONE automate get_revision $REV, [], [stdout], [ignore]) -AT_CHECK(CANONICALISE(stdout)) -AT_CHECK(cmp stdout expout, [], [ignore]) +AT_CHECK(grep '^patch "foo1"$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep 'add' stdout, [1], [ignore], [ignore]) +AT_CHECK(grep 'delete' stdout, [1], [ignore], [ignore]) + AT_CLEANUP ======================================================================== --- tests/t_update_with_pending_drop.at 00cdc65ce50b1b3b3c54d0542653c7ec47e27072 +++ tests/t_update_with_pending_drop.at af78561aa074371619cdcdd49ec78084dd0ecf0d @@ -16,10 +16,12 @@ COMMIT(testbranch) +REV=`BASE_REVISION` + AT_CHECK(cd codir && MONOTONE drop file, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE automate get_revision a12d8ad50bf5861310c22979ef6c3a8b8a686522, [], [ignore], [ignore]) +AT_CHECK(cd codir && MONOTONE automate get_revision $REV, [], [ignore], [ignore]) # make sure there are no changes in the working copy ======================================================================== --- tests/t_update_with_pending_rename.at 99e70ea11a371b7b400bd8f4dd1fad467f9645e4 +++ tests/t_update_with_pending_rename.at c77760a120745388dc4fda95d8d617b7c052ce42 @@ -16,12 +16,13 @@ COMMIT(testbranch) +REV=`BASE_REVISION` + AT_CHECK(mv codir/file codir/file2, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE rename file file2, [], [ignore], [ignore]) AT_CHECK(cd codir && MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE automate get_revision 0cb6, [1], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE automate get_revision 0cb6da39a252816db091c515efa830840e77c4eb, [], [ignore], [ignore]) +AT_CHECK(cd codir && MONOTONE automate get_revision $REV, [], [ignore], [ignore]) # make sure there are no changes in the working copy