# 
# patch "tests/t_annotate_add_collision.at"
#  from [60211c52edc81160a971196762f678d70dd94af5]
#    to [c4b22026515ae9e412a19dec5455679a9cc49d2c]
# 
# patch "tests/t_annotate_branch_collision.at"
#  from [261f44d7235b02fd6e7cdcbae76866f5ab60ff81]
#    to [9a98cd3c57767a584b7937a8ab2ddac086139847]
# 
# patch "tests/t_explicit_merge_with_anc.at"
#  from [c3dfbe2bd6c58997ffa5a037364b5cdad3b1891f]
#    to [fab2b7ccbc32dace4b439ce1ac30b6141cc6c182]
# 
# patch "tests/t_merge_lca.at"
#  from [b91ca296740e117ca8a8a2f86fad02764f126f07]
#    to [51497aebefb43f940038decb61132f2a60ee9789]
# 
# patch "tests/t_update_to_revision.at"
#  from [b6f804cced8a6863a91e4fef319b8f427762001e]
#    to [883c66fa494c93d79518368f88752de1821a0951]
# 
========================================================================
--- tests/t_annotate_add_collision.at	60211c52edc81160a971196762f678d70dd94af5
+++ tests/t_annotate_add_collision.at	c4b22026515ae9e412a19dec5455679a9cc49d2c
@@ -1,6 +1,9 @@
 AT_SETUP([annotate file added on different forks])
 MONOTONE_SETUP
 
+# This test relies on file-suturing
+AT_XFAIL_IF(true)
+
 AT_DATA(foo.left, [z
 a
 b
========================================================================
--- tests/t_annotate_branch_collision.at	261f44d7235b02fd6e7cdcbae76866f5ab60ff81
+++ tests/t_annotate_branch_collision.at	9a98cd3c57767a584b7937a8ab2ddac086139847
@@ -1,6 +1,9 @@
 AT_SETUP([annotate file on multirooted branch])
 MONOTONE_SETUP
 
+# This test relies on file-suturing
+AT_XFAIL_IF(true)
+
 #
 # If two people begin a branch with the same name,
 # then the branch does not have a unique root.  If they
========================================================================
--- tests/t_explicit_merge_with_anc.at	c3dfbe2bd6c58997ffa5a037364b5cdad3b1891f
+++ tests/t_explicit_merge_with_anc.at	fab2b7ccbc32dace4b439ce1ac30b6141cc6c182
@@ -1,6 +1,10 @@
 AT_SETUP([explicit_merge LEFT RIGHT ANC BRANCH])
 MONOTONE_SETUP
 
+# This test relies on a command-line mode which has, for the time
+# being, been disabled. Possibly no need to revive it.
+AT_XFAIL_IF(true)
+
 ADD_FILE(testfile, [a
 OLD
 c
========================================================================
--- tests/t_merge_lca.at	b91ca296740e117ca8a8a2f86fad02764f126f07
+++ tests/t_merge_lca.at	51497aebefb43f940038decb61132f2a60ee9789
@@ -1,9 +1,13 @@
 AT_SETUP([merge --lca])
 MONOTONE_SETUP
 
 # --lca is a temporary workaround for 3-way merge suckiness.  So this
 # test should go away eventually.
 
+# arguably the issue is now fixed with mark-merge. I've changed 
+# the test to do a successful merge of E and F, since, well,
+# extra merge cases never hurt. 
+
 #    A
 #   / \
 #  B   C
@@ -46,6 +50,7 @@
 
 AT_CHECK(MONOTONE merge --lca, [], [ignore], [stderr])
 AT_CHECK(QGREP($A stderr), [1])
-AT_CHECK(QGREP($B stderr) || QGREP($C stderr), [])
+AT_CHECK(QGREP($E stderr), [])
+AT_CHECK(QGREP($F stderr), [])
 
 AT_CLEANUP
========================================================================
--- tests/t_update_to_revision.at	b6f804cced8a6863a91e4fef319b8f427762001e
+++ tests/t_update_to_revision.at	883c66fa494c93d79518368f88752de1821a0951
@@ -1,9 +1,13 @@
 #  -*- Autoconf -*-
 
 AT_SETUP([updating to a given revision])
 
 MONOTONE_SETUP
 
+# This test relies on forward updating 
+# (which is disabled in monotone at the moment)
+AT_XFAIL_IF(true)
+
 AT_DATA(root, [first line of the file
 second line of the file
 third line of the file