# # patch "tests/t_add_edge.at" # from [d0c5635df674fdc6c33d5d66a0e144398e995b04] # to [b62f4ca4e76068ab4a50a61f14b19e9f03c96168] # # patch "tests/t_add_vs_commit.at" # from [de9cf601f5c2c74d2432eb4fc0531d7a572cd673] # to [795e4288501968701031a986173a6d3d4bfce367] # # patch "tests/t_merge2_add.at" # from [5bd5c17172e802ab24a998462fd0dc1738b0716a] # to [f6e80ad60bcb50d48f402619d679e8625b680357] # # patch "tests/t_merge2_add_drop_add.at" # from [2280efcb74f3d66181d016d79051b287ea144dfe] # to [c7f4977982cf74db0653b9761a13d42badeee5a4] # # patch "tests/t_merge2_data.at" # from [198ef24b2d4ec9dfa4ba2328c403a832c7cfa4c2] # to [d98ab4146cc147822d4557176bec09e3905f8d4e] # # patch "tests/t_netsync_unrelated.at" # from [e6549782dda0fd91bdbf9490021c25e1ee262c5c] # to [03b78b51712b38681a244c815bf817720aab6d37] # # patch "tests/t_related_merge2_data.at" # from [44efea63481d355ac7fda8e56ed3295189143eeb] # to [9c17bfbe8a5babc3944229c8b57c293f6143376f] # # patch "tests/t_update_with_pending_add.at" # from [357bc4be7680dd9d3a898ae914aa1c6a11a47996] # to [6770451dd8eb16fa85411dc818448694265d7cf2] # ======================================================================== --- tests/t_add_edge.at d0c5635df674fdc6c33d5d66a0e144398e995b04 +++ tests/t_add_edge.at b62f4ca4e76068ab4a50a61f14b19e9f03c96168 @@ -1,6 +1,9 @@ AT_SETUP([merging an add edge]) MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) + mkdir zz ADD_FILE(ancfile, [ancestral file ======================================================================== --- tests/t_add_vs_commit.at de9cf601f5c2c74d2432eb4fc0531d7a572cd673 +++ tests/t_add_vs_commit.at 795e4288501968701031a986173a6d3d4bfce367 @@ -1,6 +1,9 @@ AT_SETUP([add working copy commit in another]) MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) + # 1. Alice writes a file, does an add, *doesn't* do a commit, and sends patch # 2. Bob applies (modified) patch to tree, does the add, then a commit. # 3. Now Alice does an update (resolves the merge conflict, choosing Bob's changes). ======================================================================== --- tests/t_merge2_add.at 5bd5c17172e802ab24a998462fd0dc1738b0716a +++ tests/t_merge2_add.at f6e80ad60bcb50d48f402619d679e8625b680357 @@ -1,6 +1,9 @@ AT_SETUP([merging adds in unrelated revisions]) MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) + ADD_FILE(testfile1, [This is test file 1 ]) COMMIT(testbranch) ======================================================================== --- tests/t_merge2_add_drop_add.at 2280efcb74f3d66181d016d79051b287ea144dfe +++ tests/t_merge2_add_drop_add.at c7f4977982cf74db0653b9761a13d42badeee5a4 @@ -1,6 +1,8 @@ AT_SETUP([merge(, )]) +MONOTONE_SETUP -MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) AT_DATA(right_1_a, [foo blah ]) ======================================================================== --- tests/t_merge2_data.at 198ef24b2d4ec9dfa4ba2328c403a832c7cfa4c2 +++ tests/t_merge2_data.at d98ab4146cc147822d4557176bec09e3905f8d4e @@ -1,6 +1,9 @@ AT_SETUP([merging data in unrelated revisions]) MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) + AT_DATA(left, [line 1: foo line 2: something unexpected line 3: baz ======================================================================== --- tests/t_netsync_unrelated.at e6549782dda0fd91bdbf9490021c25e1ee262c5c +++ tests/t_netsync_unrelated.at 03b78b51712b38681a244c815bf817720aab6d37 @@ -1,7 +1,10 @@ AT_SETUP([(normal) netsync on partially unrelated revisions]) AT_KEYWORDS([netsync]) MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) + # This tests netsync'ing # # A B ======================================================================== --- tests/t_related_merge2_data.at 44efea63481d355ac7fda8e56ed3295189143eeb +++ tests/t_related_merge2_data.at 9c17bfbe8a5babc3944229c8b57c293f6143376f @@ -1,6 +1,9 @@ AT_SETUP([merging data in unrelated files]) MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) + AT_DATA(left, [line 1: foo line 2: something unexpected line 3: baz ======================================================================== --- tests/t_update_with_pending_add.at 357bc4be7680dd9d3a898ae914aa1c6a11a47996 +++ tests/t_update_with_pending_add.at 6770451dd8eb16fa85411dc818448694265d7cf2 @@ -1,8 +1,10 @@ # -*- Autoconf -*- AT_SETUP([update with pending add]) +MONOTONE_SETUP -MONOTONE_SETUP +# This test relies on file-suturing +AT_XFAIL_IF(true) ADD_FILE(file, [file ])