# 
# 
# patch "tester.cc"
#  from [10fd08cd73cede7e5f10bc265f08e20b5cbca652]
#    to [20b77287f0ddfa954fd154a0ace17d672dce7345]
# 
# patch "tests/merge_into_workspace/__driver__.lua"
#  from [e19963a7f4d2b600b7c668fab856b4328c654ea3]
#    to [decc7983de7719c201ca985325d285aae0226075]
# 
# patch "tests/merge_into_workspace/expected-log"
#  from [cb589fc6f67d67c443e6c1b1116fcd730cfb1b53]
#    to [bb54916130033dda957988c62b47da01a62f8003]
# 
# patch "tests/merge_into_workspace/expected-log-left"
#  from [9f34a749db3abfbd4881d4561a6e93874c036bf2]
#    to [af5ce89ebb99fce921a967cdf34558b075ca6e5a]
# 
# patch "tests/merge_into_workspace/expected-manifest"
#  from [c95968057346e2a898b61fc4398386255947902e]
#    to [387f52efd54eacff7c91f990833e9ecbc1d41204]
# 
# patch "tests/merge_into_workspace_attr_corpse/expected-roster"
#  from [b3a5ea5659a6510fa4c9cd6ab8bf40c93ed2b101]
#    to [ec6ec9f4baf4b624a31910544eada0aaae4ff5e2]
# 
# patch "tests/merge_into_workspace_files_added/expected-revision"
#  from [c1c26086247e1d66c3e41b396b7e56ad45e01f2c]
#    to [8c8848dd89bc0626bb099b7d1128fc93cdb5d78e]
# 
============================================================
--- tester.cc	10fd08cd73cede7e5f10bc265f08e20b5cbca652
+++ tester.cc	20b77287f0ddfa954fd154a0ace17d672dce7345
@@ -67,7 +67,11 @@ bool make_accessible(string const &name)
   bool ok = (stat(name.c_str(), &st) == 0);
   if (!ok)
     return false;
-  return (chmod(name.c_str(), st.st_mode | S_IREAD | S_IWRITE | S_IEXEC) == 0);
+  mode_t new_mode = st.st_mode;
+  if (S_ISDIR(st.st_mode))
+    new_mode |= S_IEXEC;
+  new_mode |= S_IREAD | S_IWRITE;
+  return (chmod(name.c_str(), new_mode) == 0);
 }
 #endif
 
============================================================
--- tests/merge_into_workspace/__driver__.lua	e19963a7f4d2b600b7c668fab856b4328c654ea3
+++ tests/merge_into_workspace/__driver__.lua	decc7983de7719c201ca985325d285aae0226075
@@ -74,7 +74,7 @@ check(mtn("automate", "get_current_revis
 
 -- some automate commands that should do sensible things
 check(mtn("automate", "get_current_revision_id"), 0,
-      "9491240daab3028f583e4d0e0239da3e626fda2b\n", nil)
+      "5e009ca0dc972a9b09a7fbfb647908bee07fb562\n", nil)
 
 check(get("expected-manifest"))
 check(mtn("automate", "get_manifest_of"), 0, {"expected-manifest"}, nil)
============================================================
--- tests/merge_into_workspace/expected-log	cb589fc6f67d67c443e6c1b1116fcd730cfb1b53
+++ tests/merge_into_workspace/expected-log	bb54916130033dda957988c62b47da01a62f8003
@@ -1,8 +1,8 @@
 -----------------------------------------------------------------
-Revision: 0eb47cecdd459bb5a1017dc787cf014ae3fcdfb9
-Ancestor: deb1d49035983e4785ddba48904924a5307d59eb
+Revision: 04093de26437e634d2b43f1722e22fcc6b3804c3
+Ancestor: 87c726bb950efb3d809662b86700a8566346970d
 Author: address@hidden
-Date: 2007-02-09T18:50:42
+Date: 2007-02-28T02:09:14
 Branch: testbranch
 
 Modified files:
@@ -13,10 +13,10 @@ blah-blah
 blah-blah
 
 -----------------------------------------------------------------
-Revision: e9e23d2764be2b4e8d1b7350f5ab5c6b34901669
-Ancestor: deb1d49035983e4785ddba48904924a5307d59eb
+Revision: 21320a960288df775cd62b01f1b40e981f4ecd65
+Ancestor: 87c726bb950efb3d809662b86700a8566346970d
 Author: address@hidden
-Date: 2007-02-09T18:50:41
+Date: 2007-02-28T02:09:13
 Branch: testbranch
 
 Modified files:
@@ -27,18 +27,16 @@ blah-blah
 blah-blah
 
 -----------------------------------------------------------------
-Revision: deb1d49035983e4785ddba48904924a5307d59eb
+Revision: 87c726bb950efb3d809662b86700a8566346970d
 Ancestor: 
 Author: address@hidden
-Date: 2007-02-09T18:50:41
+Date: 2007-02-28T02:09:12
 Branch: testbranch
 
 Added files:
         otherfile testfile
 Added directories:
         
-Modified attrs:
-        otherfile testfile
 
 ChangeLog: 
 
============================================================
--- tests/merge_into_workspace/expected-log-left	9f34a749db3abfbd4881d4561a6e93874c036bf2
+++ tests/merge_into_workspace/expected-log-left	af5ce89ebb99fce921a967cdf34558b075ca6e5a
@@ -1,8 +1,8 @@
 -----------------------------------------------------------------
-Revision: e9e23d2764be2b4e8d1b7350f5ab5c6b34901669
-Ancestor: deb1d49035983e4785ddba48904924a5307d59eb
+Revision: 21320a960288df775cd62b01f1b40e981f4ecd65
+Ancestor: 87c726bb950efb3d809662b86700a8566346970d
 Author: address@hidden
-Date: 2007-02-09T19:14:43
+Date: 2007-02-28T02:11:20
 Branch: testbranch
 
 Modified files:
@@ -13,18 +13,16 @@ blah-blah
 blah-blah
 
 -----------------------------------------------------------------
-Revision: deb1d49035983e4785ddba48904924a5307d59eb
+Revision: 87c726bb950efb3d809662b86700a8566346970d
 Ancestor: 
 Author: address@hidden
-Date: 2007-02-09T19:14:42
+Date: 2007-02-28T02:11:19
 Branch: testbranch
 
 Added files:
         otherfile testfile
 Added directories:
         
-Modified attrs:
-        otherfile testfile
 
 ChangeLog: 
 
============================================================
--- tests/merge_into_workspace/expected-manifest	c95968057346e2a898b61fc4398386255947902e
+++ tests/merge_into_workspace/expected-manifest	387f52efd54eacff7c91f990833e9ecbc1d41204
@@ -1,11 +1,9 @@ content [db19801f1850d7d85114e6c3f80d019
 format_version "1"
 
 dir ""
 
    file "otherfile"
 content [db19801f1850d7d85114e6c3f80d019f5bdb804a]
-   attr "mtn:execute" "true"
 
    file "testfile"
 content [aed28f362beb27308db048db953a985fba45d8e7]
-   attr "mtn:execute" "true"
============================================================
--- tests/merge_into_workspace_attr_corpse/expected-roster	b3a5ea5659a6510fa4c9cd6ab8bf40c93ed2b101
+++ tests/merge_into_workspace_attr_corpse/expected-roster	ec6ec9f4baf4b624a31910544eada0aaae4ff5e2
@@ -1,19 +1,17 @@ format_version "1"
 format_version "1"
 
       dir ""
     ident "1"
-    birth [5e2a549855d47ce5627e826265ef016bce093539]
-path_mark [5e2a549855d47ce5627e826265ef016bce093539]
+    birth [e032edcb78885de86a3a3a05f641ae1d25f63988]
+path_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
 
         file "testfile"
      content [c537e8ec248c6cd32e54cd6fa98ae15743f996b4]
        ident "2"
-        attr "mtn:execute" "true"
 dormant_attr "left-attr"
 dormant_attr "right-attr"
+       birth [e032edcb78885de86a3a3a05f641ae1d25f63988]
+   path_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
+content_mark [e032edcb78885de86a3a3a05f641ae1d25f63988]
+   attr_mark "left-attr" [fd014440f510fde3f7d8093c03ee510fb2781694]
+   attr_mark "right-attr" [7dcdf53649d29ab55ca7f400b12771ffa3493702]
-       birth [5e2a549855d47ce5627e826265ef016bce093539]
-   path_mark [5e2a549855d47ce5627e826265ef016bce093539]
-content_mark [5e2a549855d47ce5627e826265ef016bce093539]
-   attr_mark "left-attr" [e29deed4801eb2e6e0c2fe33cc257b8eb885f50e]
-   attr_mark "mtn:execute" [5e2a549855d47ce5627e826265ef016bce093539]
-   attr_mark "right-attr" [e279d8a69e83b8b6f52fc8435c57a17a289408f7]
============================================================
--- tests/merge_into_workspace_files_added/expected-revision	c1c26086247e1d66c3e41b396b7e56ad45e01f2c
+++ tests/merge_into_workspace_files_added/expected-revision	8c8848dd89bc0626bb099b7d1128fc93cdb5d78e
@@ -1,21 +1,13 @@ format_version "1"
 format_version "1"
 
-new_manifest [3c2476a7df09bb65edf97130b298503b55629d9d]
+new_manifest [1ad9c86d349f3f4af96ddd1147f6da0e3d52a234]
 
-old_revision [40723f467fff1acf0d7a83834b34e132fe5d919e]
+old_revision [a140446fe05fa24bd367c57ea9b572dc264188cb]
 
 add_file "left"
  content [0ffe36a4ca2169de7543a67f92134ea93636b246]
 
-  set "left"
- attr "mtn:execute"
-value "true"
+old_revision [c77393b91d1abd3f4306465ca468b2f87494c910]
 
-old_revision [b078b838350109c6c3c382517910271f0eb47eb6]
-
 add_file "right"
  content [7478fc33b2476515959ea9be9306295a36a22d64]
-
-  set "right"
- attr "mtn:execute"
-value "true"