# 
# patch "diff_patch.cc"
#  from [9156212766616d8acb2d9bb55d3f3481e82bba75]
#    to [ffa8406fe33c46599e4dba7bcda4f1040a1090f6]
# 
# patch "tests/t_update_with_pending_add.at"
#  from [6770451dd8eb16fa85411dc818448694265d7cf2]
#    to [3d046ef7f426d6e5d89b0423c72242fde52142e4]
# 
# patch "work.cc"
#  from [b3cb789b8d340fdf48ce687bce6b71e620668e67]
#    to [f8ee64c721cb624b0e58ad9139b93e0abd930129]
# 
========================================================================
--- diff_patch.cc	9156212766616d8acb2d9bb55d3f3481e82bba75
+++ diff_patch.cc	ffa8406fe33c46599e4dba7bcda4f1040a1090f6
@@ -682,7 +682,7 @@
       left_encoding = this->get_file_encoding(left_path, left_ros);
       anc_encoding = this->get_file_encoding(anc_path, anc_ros);
       right_encoding = this->get_file_encoding(right_path, right_ros);
-        
+
       vector<string> left_lines, ancestor_lines, right_lines, merged_lines;
       split_into_lines(left_unpacked(), left_encoding, left_lines);
       split_into_lines(ancestor_unpacked(), anc_encoding, ancestor_lines);
========================================================================
--- tests/t_update_with_pending_add.at	6770451dd8eb16fa85411dc818448694265d7cf2
+++ tests/t_update_with_pending_add.at	3d046ef7f426d6e5d89b0423c72242fde52142e4
@@ -13,7 +13,7 @@
 
 AT_CHECK(MONOTONE --branch testbranch co codir, [], [ignore], [ignore])
 
-ADD_FILE(file2, [file2
+ADD_FILE(file3, [file3
 ])
 
 COMMIT(testbranch)
@@ -24,10 +24,6 @@
 AT_CHECK(cd codir && MONOTONE add file2, [], [ignore], [ignore])
 AT_CHECK(cd codir && MONOTONE update, [], [ignore], [ignore])
 
-# why doesn't an abbreviated revision id work
-
-AT_CHECK(cd codir && MONOTONE automate get_revision b482c907f27f160f7ff9259d353d5d5399fb9fc4, [], [ignore], [ignore])
-
 # make sure there are no changes in the working copy
 
 AT_CHECK(test ! -e codir/MT/work, [], [ignore], [ignore])
========================================================================
--- work.cc	b3cb789b8d340fdf48ce687bce6b71e620668e67
+++ work.cc	f8ee64c721cb624b0e58ad9139b93e0abd930129
@@ -619,7 +619,7 @@
   if (ros.has_node(sp))
     {
       node_t n = ros.get_node(sp);
-      full_attr_map_t::const_iterator i = n->attrs.find(manual_merge_attribute);
+      full_attr_map_t::const_iterator i = n->attrs.find(key);
       if (i != n->attrs.end() && i->second.first)
         {
           val = i->second.second;