# 
# 
# patch "tests/t_rosterify_rename.at"
#  from [99cf14c901a2341534a388df1bbdd1f4a84aaf07]
#    to [0945ff4b2049020ee53c4bb434ce8d7018512a05]
# 
# patch "work.cc"
#  from [7c3492b6c9f41728f0f70bf75f77e447ef21c37c]
#    to [7162c5181095ffbb848d1443de24b82fb6b86125]
# 
============================================================
--- tests/t_rosterify_rename.at	99cf14c901a2341534a388df1bbdd1f4a84aaf07
+++ tests/t_rosterify_rename.at	0945ff4b2049020ee53c4bb434ce8d7018512a05
@@ -80,9 +80,9 @@
 
 # check the second revision
 AT_DATA([expout], [format_version "1"
-new_manifest @<:@274cc1314b1218394f058f9174faa062aaf08531@:>@
+new_manifest @<:@0ee54a587bc4465f17eaf5de2807fbd7d9f46c75@:>@
 
-old_revision @<:@e9f446845505167b1b939cbcf1f5797372fe96f0@:>@
+old_revision @<:@0e2ccc951f2ccc0f2b5c45bfce33af6095be56d7@:>@
 
 rename "testdir_start"
     to "testdir_end"
============================================================
--- work.cc	7c3492b6c9f41728f0f70bf75f77e447ef21c37c
+++ work.cc	7162c5181095ffbb848d1443de24b82fb6b86125
@@ -601,11 +601,11 @@
   write_data(ip_path, dat);
 }
 
-string const encoding_attribute("encoding");
+string const encoding_attribute("mtn:encoding");
 string const binary_encoding("binary");
 string const default_encoding("default");
 
-string const manual_merge_attribute("manual_merge");
+string const manual_merge_attribute("mtn:manual_merge");
 
 bool 
 get_attribute_from_roster(roster_t const & ros,