# 
# patch "tests/t_movedel.at"
#  from [2f545abc6222e62e2d69bfd8ea68713106481668]
#    to [b0825386b5bb4346194fbb6348d7706a313ee3b8]
# 
# patch "tests/t_movepatch.at"
#  from [751078aaada3ca15fbbd54aa86f525589d83e148]
#    to [83acbd4252c65f8826dab7107d478626f32243be]
# 
--- tests/t_movedel.at
+++ tests/t_movedel.at
@@ -11,32 +11,34 @@
 
 # produce root
 AT_CHECK(MONOTONE add foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE --branch=testbranch commit blah-blah, [], [ignore], [ignore])
-ROOT_M_SHA=`SHA1(MT/manifest)`
+AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore])
+ROOT_R_SHA=`BASE_REVISION`
 ROOT_F_SHA=`SHA1(foo)`
 
 # produce move edge
 AT_CHECK(MONOTONE add baz, [], [ignore], [ignore])
 AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore])
 AT_CHECK(cp foo bar)
-AT_CHECK(MONOTONE commit blah-blah, [], [ignore], [ignore])
+AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore])
 
 # revert to root
-PROBE_NODE(foo, $ROOT_M_SHA, $ROOT_F_SHA)
+PROBE_NODE(foo, $ROOT_R_SHA, $ROOT_F_SHA)
 AT_CHECK(rm bar)
 
 # make a delete edge on the move preimage
 AT_CHECK(MONOTONE drop foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE commit blah-blah, [], [ignore], [ignore])
+AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore])
 
 # merge the del and the rename
 AT_CHECK(MONOTONE merge, [], [ignore], [ignore])
 AT_CHECK(MONOTONE update, [], [ignore], [ignore])
 
 # check that the delete landed on the renamed target
-AT_CHECK(grep baz MT/manifest, [0], [ignore], [ignore])
-AT_CHECK(grep bar MT/manifest, [1], [ignore], [ignore])
-AT_CHECK(grep foo MT/manifest, [1], [ignore], [ignore])
+AT_CHECK(MONOTONE cat manifest, [], [stdout])
+AT_CHECK(mv stdout manifest)
+AT_CHECK(grep baz manifest, [0], [ignore], [ignore])
+AT_CHECK(grep bar manifest, [1], [ignore], [ignore])
+AT_CHECK(grep foo manifest, [1], [ignore], [ignore])
 
 AT_CLEANUP
 
--- tests/t_movepatch.at
+++ tests/t_movepatch.at
@@ -11,30 +11,32 @@
 
 # produce root
 AT_CHECK(MONOTONE add foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE --branch=testbranch commit blah-blah, [], [ignore], [ignore])
-ROOT_M_SHA=`SHA1(MT/manifest)`
+AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore])
+ROOT_R_SHA=`BASE_REVISION`
 ROOT_F_SHA=`SHA1(foo)`
 
 # produce move edge
 AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore])
 AT_CHECK(cp foo bar)
-AT_CHECK(MONOTONE commit blah-blah, [], [ignore], [ignore])
+AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore])
 
 # revert to root
-PROBE_NODE(foo, $ROOT_M_SHA, $ROOT_F_SHA)
+PROBE_NODE(foo, $ROOT_R_SHA, $ROOT_F_SHA)
 AT_CHECK(rm bar)
 
 # make a delta edge on the move preimage
 AT_CHECK(cp bleh foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE commit blah-blah, [], [ignore], [ignore])
+AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore])
 
 # merge the delta and the rename
 AT_CHECK(MONOTONE merge, [], [ignore], [ignore])
 AT_CHECK(MONOTONE update, [], [ignore], [ignore])
 
 # check that the delta landed on the renamed target
-AT_CHECK(grep bar MT/manifest, [0], [ignore], [ignore])
-AT_CHECK(grep foo MT/manifest, [1], [ignore], [ignore])
+AT_CHECK(MONOTONE cat manifest, [], [stdout])
+AT_CHECK(mv stdout manifest)
+AT_CHECK(grep bar manifest, [0], [ignore], [ignore])
+AT_CHECK(grep foo manifest, [1], [ignore], [ignore])
 AT_CHECK(grep bleh bar, [0], [ignore], [ignore])
 AT_CHECK(rm bar)