#
#
# patch "roster_merge.cc"
#  from [9bb39c2c87f92180b0a5db5697ff6ea15b82d25b]
#    to [8719a10632e29c70df2f8e17e91a13607e40d258]
#
============================================================
--- roster_merge.cc	9bb39c2c87f92180b0a5db5697ff6ea15b82d25b
+++ roster_merge.cc	8719a10632e29c70df2f8e17e91a13607e40d258
@@ -540,24 +540,28 @@ roster_merge_result::report_missing_root
             P(F("directory '%s' pivoted to root on the left") % left_lca_name);
 
           if (!right_roster.has_node(left_root))
-            if (basic_io)
-              {
-                st.push_str_pair(syms::right_type, "deleted directory");
-                st.push_str_pair(syms::ancestor_name, left_lca_name.as_external());
-              }
-            else
-              P(F("directory '%s' deleted on the right") % left_lca_name);
+            {
+              if (basic_io)
+                {
+                  st.push_str_pair(syms::right_type, "deleted directory");
+                  st.push_str_pair(syms::ancestor_name, left_lca_name.as_external());
+                }
+              else
+                P(F("directory '%s' deleted on the right") % left_lca_name);
+            }
         }
       else if (left_root == left_lca_root && right_root != right_lca_root)
         {
           if (!left_roster.has_node(right_root))
-            if (basic_io)
-              {
-                st.push_str_pair(syms::left_type, "deleted directory");
-                st.push_str_pair(syms::ancestor_name, right_lca_name.as_external());
-              }
-            else
-              P(F("directory '%s' deleted on the left") % right_lca_name);
+            {
+              if (basic_io)
+                {
+                  st.push_str_pair(syms::left_type, "deleted directory");
+                  st.push_str_pair(syms::ancestor_name, right_lca_name.as_external());
+                }
+              else
+                P(F("directory '%s' deleted on the left") % right_lca_name);
+            }
 
           if (basic_io)
             {
@@ -578,22 +582,26 @@ roster_merge_result::report_missing_root
             P(F("directory '%s' pivoted to root on the left") % left_lca_name);
 
           if (!right_roster.has_node(left_root))
-            if (basic_io)
-              {
-                st.push_str_pair(syms::right_type, "deleted directory");
-                st.push_str_pair(syms::ancestor_name, left_lca_name.as_external());
-              }
-            else
-              P(F("directory '%s' deleted on the right") % left_lca_name);
+            {
+              if (basic_io)
+                {
+                  st.push_str_pair(syms::right_type, "deleted directory");
+                  st.push_str_pair(syms::ancestor_name, left_lca_name.as_external());
+                }
+              else
+                P(F("directory '%s' deleted on the right") % left_lca_name);
+            }
 
           if (!left_roster.has_node(right_root))
-            if (basic_io)
-              {
-                st.push_str_pair(syms::left_type, "deleted directory");
-                st.push_str_pair(syms::ancestor_name, right_lca_name.as_external());
-              }
-            else
-              P(F("directory '%s' deleted on the left") % right_lca_name);
+            {
+              if (basic_io)
+                {
+                  st.push_str_pair(syms::left_type, "deleted directory");
+                  st.push_str_pair(syms::ancestor_name, right_lca_name.as_external());
+                }
+              else
+                P(F("directory '%s' deleted on the left") % right_lca_name);
+            }
 
           if (basic_io)
             {
@@ -755,32 +763,40 @@ roster_merge_result::report_directory_lo
         P(F("conflict: directory loop created"));
 
       if (left_name != lca_name)
-        if (basic_io)
-          put_rename_conflict_left (st, adaptor, conflict.nid);
-        else
-          P(F("'%s' renamed to '%s' on the left")
-            % lca_name % left_name);
+        {
+          if (basic_io)
+            put_rename_conflict_left (st, adaptor, conflict.nid);
+          else
+            P(F("'%s' renamed to '%s' on the left")
+              % lca_name % left_name);
+        }
 
       if (right_name != lca_name)
-        if (basic_io)
-          put_rename_conflict_right (st, adaptor, conflict.nid);
-        else
-          P(F("'%s' renamed to '%s' on the right")
-            % lca_name % right_name);
+        {
+          if (basic_io)
+            put_rename_conflict_right (st, adaptor, conflict.nid);
+          else
+            P(F("'%s' renamed to '%s' on the right")
+              % lca_name % right_name);
+        }
 
       if (left_parent_name != lca_parent_name)
-        if (basic_io)
-          put_rename_conflict_left (st, adaptor, conflict.parent_name.first);
-        else
-          P(F("'%s' renamed to '%s' on the left")
-            % lca_parent_name % left_parent_name);
+        {
+          if (basic_io)
+            put_rename_conflict_left (st, adaptor, conflict.parent_name.first);
+          else
+            P(F("'%s' renamed to '%s' on the left")
+              % lca_parent_name % left_parent_name);
+        }
 
       if (right_parent_name != lca_parent_name)
-        if (basic_io)
-          put_rename_conflict_right (st, adaptor, conflict.parent_name.first);
-        else
-          P(F("'%s' renamed to '%s' on the right")
-            % lca_parent_name % right_parent_name);
+        {
+          if (basic_io)
+            put_rename_conflict_right (st, adaptor, conflict.parent_name.first);
+          else
+            P(F("'%s' renamed to '%s' on the right")
+              % lca_parent_name % right_parent_name);
+        }
 
       if (basic_io)
         put_stanza(st, output);