# 
# 
# patch "tests/merge_into_workspace_attr_corpse/expected-roster"
#  from [ec6ec9f4baf4b624a31910544eada0aaae4ff5e2]
#    to [b3a5ea5659a6510fa4c9cd6ab8bf40c93ed2b101]
# 
# patch "tests/merge_into_workspace_files_added/expected-revision"
#  from [8c8848dd89bc0626bb099b7d1128fc93cdb5d78e]
#    to [c1c26086247e1d66c3e41b396b7e56ad45e01f2c]
# 
============================================================
--- tests/merge_into_workspace_attr_corpse/expected-roster	ec6ec9f4baf4b624a31910544eada0aaae4ff5e2
+++ tests/merge_into_workspace_attr_corpse/expected-roster	b3a5ea5659a6510fa4c9cd6ab8bf40c93ed2b101
@@ -1,17 +1,19 @@ format_version "1"
 format_version "1"
 
       dir ""
     ident "1"
-    birth [e032edcb78885de86a3a3a05f641ae1d25f63988]
-path_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
+    birth [5e2a549855d47ce5627e826265ef016bce093539]
+path_mark [5e2a549855d47ce5627e826265ef016bce093539]
 
         file "testfile"
      content [c537e8ec248c6cd32e54cd6fa98ae15743f996b4]
        ident "2"
+        attr "mtn:execute" "true"
 dormant_attr "left-attr"
 dormant_attr "right-attr"
+       birth [5e2a549855d47ce5627e826265ef016bce093539]
+   path_mark [5e2a549855d47ce5627e826265ef016bce093539]
+content_mark [5e2a549855d47ce5627e826265ef016bce093539]
+   attr_mark "left-attr" [e29deed4801eb2e6e0c2fe33cc257b8eb885f50e]
+   attr_mark "mtn:execute" [5e2a549855d47ce5627e826265ef016bce093539]
+   attr_mark "right-attr" [e279d8a69e83b8b6f52fc8435c57a17a289408f7]
-       birth [e032edcb78885de86a3a3a05f641ae1d25f63988]
-   path_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
-content_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
-   attr_mark "left-attr" [fd014440f510fde3f7d8093c03ee510fb2781694]
-   attr_mark "right-attr" [7dcdf53649d29ab55ca7f400b12771ffa3493702]
============================================================
--- tests/merge_into_workspace_files_added/expected-revision	8c8848dd89bc0626bb099b7d1128fc93cdb5d78e
+++ tests/merge_into_workspace_files_added/expected-revision	c1c26086247e1d66c3e41b396b7e56ad45e01f2c
@@ -1,13 +1,21 @@ format_version "1"
 format_version "1"
 
-new_manifest [1ad9c86d349f3f4af96ddd1147f6da0e3d52a234]
+new_manifest [3c2476a7df09bb65edf97130b298503b55629d9d]
 
-old_revision [a140446fe05fa24bd367c57ea9b572dc264188cb]
+old_revision [40723f467fff1acf0d7a83834b34e132fe5d919e]
 
 add_file "left"
  content [0ffe36a4ca2169de7543a67f92134ea93636b246]
 
-old_revision [c77393b91d1abd3f4306465ca468b2f87494c910]
+  set "left"
+ attr "mtn:execute"
+value "true"
 
+old_revision [b078b838350109c6c3c382517910271f0eb47eb6]
+
 add_file "right"
  content [7478fc33b2476515959ea9be9306295a36a22d64]
+
+  set "right"
+ attr "mtn:execute"
+value "true"