# 
# 
# patch "roster_merge.cc"
#  from [9af76ab8ca92de69af97de8b8550da60b6a3180d]
#    to [890ca37b82f4b4de03680cb660a40db17ae97664]
# 
# patch "tests/t_attr.at"
#  from [6b10abf13b013e89e7cda8cc35134a21dc036621]
#    to [0d210db46b63bccaed104ad8f7255f9dd1231783]
# 
# patch "tests/t_attr_drop.at"
#  from [78473fb350f812e2f0bb9e6b6e65daaa889b0626]
#    to [3b91871f5b1053a99a31a89ba465a35ebb8b8aba]
# 
# patch "tests/t_attr_init.at"
#  from [5f88d7c651d2287951fe0181212da2a13331a9ad]
#    to [fc2caec18c322cfab3b2f02504598cbfbfebb893]
# 
# patch "tests/t_attributes.at"
#  from [0ab87a6eb23ea92b166619c30fae7f0bca7c7cd1]
#    to [f7706c8149b4f32117cc0616bb3a12c5e9b7e44f]
# 
# patch "tests/t_merge_manual.at"
#  from [30eeeb2ea878e180248e8969dda05c07cd9df743]
#    to [e0a2e404966798d72544ff7a7d227cdf38164b9b]
# 
============================================================
--- roster_merge.cc	9af76ab8ca92de69af97de8b8550da60b6a3180d
+++ roster_merge.cc	890ca37b82f4b4de03680cb660a40db17ae97664
@@ -384,7 +384,7 @@
                       safe_insert(new_n->attrs, attr_i.left_value());
                       break;
                     case parallel::in_right:
-                      safe_insert(new_n->attrs, attr_i.left_value());
+                      safe_insert(new_n->attrs, attr_i.right_value());
                       break;
                     case parallel::in_both:
                       std::pair<bool, attr_value> new_value;
============================================================
--- tests/t_attr.at	6b10abf13b013e89e7cda8cc35134a21dc036621
+++ tests/t_attr.at	0d210db46b63bccaed104ad8f7255f9dd1231783
@@ -1,13 +1,13 @@
-AT_SETUP([attr set adds .mt-attrs])
+AT_SETUP([attr set/attr get])
 MONOTONE_SETUP
 
 ADD_FILE(testfile, [foo bar
 ])
-AT_CHECK(MONOTONE attr set testfile unique_key unique_value, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set testfile test:unique_key unique_value, [], [ignore], [ignore])
 AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore])
-AT_CHECK(QGREP(unique_key stdout))
+AT_CHECK(QGREP(test:unique_key stdout))
 AT_CHECK(QGREP(unique_value stdout))
-AT_CHECK(MONOTONE attr get testfile unique_key, [], [stdout], [ignore])
+AT_CHECK(MONOTONE attr get testfile test:unique_key, [], [stdout], [ignore])
 AT_CHECK(QGREP(unique_value stdout))
 
 COMMIT(testbranch)
============================================================
--- tests/t_attr_drop.at	78473fb350f812e2f0bb9e6b6e65daaa889b0626
+++ tests/t_attr_drop.at	3b91871f5b1053a99a31a89ba465a35ebb8b8aba
@@ -1,26 +1,26 @@
-AT_SETUP([attr drop drops entries from .mt-attrs])
+AT_SETUP([attr drop])
 MONOTONE_SETUP
 
 ADD_FILE(testfile, [foo bar
 ])
-AT_CHECK(MONOTONE attr set testfile first_key first_value, [], [ignore], [ignore])
-AT_CHECK(MONOTONE attr set testfile second_key second_value, [], [ignore], [ignore])
-AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore])
-AT_CHECK(QGREP(first_key stdout))
+AT_CHECK(MONOTONE attr set testfile test:first_key first_value, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set testfile test:second_key second_value, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr get test:testfile, [], [stdout], [ignore])
+AT_CHECK(QGREP(test:first_key stdout))
 AT_CHECK(QGREP(first_value stdout))
-AT_CHECK(QGREP(second_key stdout))
+AT_CHECK(QGREP(test:second_key stdout))
 AT_CHECK(QGREP(second_value stdout))
-AT_CHECK(MONOTONE attr drop testfile first_key, [], [stdout], [ignore])
+AT_CHECK(MONOTONE attr drop testfile test:first_key, [], [stdout], [ignore])
 AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore])
-AT_CHECK(QGREP(first_key stdout), [1])
+AT_CHECK(QGREP(test:first_key stdout), [1])
 AT_CHECK(QGREP(first_value stdout), [1])
-AT_CHECK(QGREP(second_key stdout))
+AT_CHECK(QGREP(test:second_key stdout))
 AT_CHECK(QGREP(second_value stdout))
 AT_CHECK(MONOTONE attr drop testfile, [], [stdout], [ignore])
 AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore])
-AT_CHECK(QGREP(first_key stdout), [1])
+AT_CHECK(QGREP(test:first_key stdout), [1])
 AT_CHECK(QGREP(first_value stdout), [1])
-AT_CHECK(QGREP(second_key stdout), [1])
+AT_CHECK(QGREP(test:second_key stdout), [1])
 AT_CHECK(QGREP(second_value stdout), [1])
 
 AT_CLEANUP
============================================================
--- tests/t_attr_init.at	5f88d7c651d2287951fe0181212da2a13331a9ad
+++ tests/t_attr_init.at	fc2caec18c322cfab3b2f02504598cbfbfebb893
@@ -5,7 +5,7 @@
 if (attr_init_functions == nil) then
   attr_init_functions = {}
 end
-attr_init_functions[["test_attr"]] =
+attr_init_functions[["test:test_attr"]] =
   function(filename)
      if filename == "magic" then
         return "bob"
@@ -23,11 +23,11 @@
 AT_CHECK(MONOTONE --rcfile=hook.lua add magic, [], [ignore], [ignore])
 
 AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore])
-AT_CHECK(QGREP(test_attr stdout), [1])
+AT_CHECK(QGREP(test:test_attr stdout), [1])
 AT_CHECK(QGREP(bob stdout), [1])
 
 AT_CHECK(MONOTONE attr get magic, [], [stdout], [ignore])
-AT_CHECK(QGREP(test_attr stdout), [])
+AT_CHECK(QGREP(test:test_attr stdout), [])
 AT_CHECK(QGREP(bob stdout), [])
 
 AT_CLEANUP
============================================================
--- tests/t_attributes.at	0ab87a6eb23ea92b166619c30fae7f0bca7c7cd1
+++ tests/t_attributes.at	f7706c8149b4f32117cc0616bb3a12c5e9b7e44f
@@ -12,27 +12,27 @@
 
 AT_CHECK(MONOTONE add foo, [], [ignore], [ignore])
 AT_CHECK(MONOTONE add a, [], [ignore], [ignore])
-AT_CHECK(MONOTONE attr set foo test_attr true, [], [ignore], [ignore])
-AT_CHECK(MONOTONE attr set a test_attr 1, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set foo test:test_attr true, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set a test:test_attr 1, [], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore])
 CO_R_SHA1=`BASE_REVISION`
 
-AT_CHECK(MONOTONE attr drop foo test_attr, [], [ignore], [ignore])
-AT_CHECK(MONOTONE attr set a test_attr 2, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr drop foo test:test_attr, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set a test:test_attr 2, [], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore])
 UPDATE_R_SHA1=`BASE_REVISION`
 
 # Check checkouts.
 AT_CHECK(rm -rf co-dir)
 AT_CHECK(MONOTONE checkout --revision=$CO_R_SHA1 co-dir, [], [stdout])
-AT_CHECK(grep "test_attr:foo:true" stdout, [], [ignore])
-AT_CHECK(grep "test_attr:a:1" stdout, [], [ignore])
+AT_CHECK(grep "test:test_attr:foo:true" stdout, [], [ignore])
+AT_CHECK(grep "test:test_attr:a:1" stdout, [], [ignore])
 
 # Check updates.
 AT_CHECK(rm -rf co-dir)
 AT_CHECK(MONOTONE checkout --revision=$UPDATE_R_SHA1 co-dir, [], [stdout])
-AT_CHECK(grep "test_attr:foo" stdout, [1], [ignore])
-AT_CHECK(grep "test_attr:a:2" stdout, [], [ignore])
+AT_CHECK(grep "test:test_attr:foo" stdout, [1], [ignore])
+AT_CHECK(grep "test:test_attr:a:2" stdout, [], [ignore])
 
 # check that files must exist to have attributes set
 AT_CHECK(MONOTONE attr set missing execute, [1], [ignore], [ignore])
============================================================
--- tests/t_merge_manual.at	30eeeb2ea878e180248e8969dda05c07cd9df743
+++ tests/t_merge_manual.at	e0a2e404966798d72544ff7a7d227cdf38164b9b
@@ -223,12 +223,12 @@
 
 # hook forces all files binary
 AT_DATA(binary.lua, [if (attr_init_functions == nil) then attr_init_functions = {} end
-attr_init_functions[["manual_merge"]] = function(filename) return "true" end 
+attr_init_functions[["mtn:manual_merge"]] = function(filename) return "true" end 
 ])
 
 # hook forces all files text
 AT_DATA(text.lua, [if (attr_init_functions == nil) then attr_init_functions = {} end
-attr_init_functions[["manual_merge"]] = function(filename) return "false" end 
+attr_init_functions[["mtn:manual_merge"]] = function(filename) return "false" end 
 ])
 
 # --- first: auto add as binary