#
#
# patch "cmd_netsync.cc"
#  from [d0cd909ad2e6f2da5b2b0d01fb251c6f3f0df6f4]
#    to [06892e12ebce44dcc18afa2efb2d22aa188f1f88]
# 
# patch "network/netsync_session.cc"
#  from [980227d86979241f1d009ae502af589ecb59e732]
#    to [9fa376cc67004a572fd57b5f2e2b17416b68d5ef]
# 
# patch "network/netsync_session.hh"
#  from [bc423b7029db3ce08c533108faab24e48e982e2f]
#    to [cf060f720312e40d90a4457705d643c9fc959ec8]
#
============================================================
--- cmd_netsync.cc	d0cd909ad2e6f2da5b2b0d01fb251c6f3f0df6f4
+++ cmd_netsync.cc	06892e12ebce44dcc18afa2efb2d22aa188f1f88
@@ -358,17 +358,17 @@ print_dryrun_info_auto(protocol_role rol
       // sink or sink_and_source; print sink info
       st.push_symbol(syms::receive);
 
-      if (info->client.dryrun_incoming_keys_is_estimate)
+      if (info->keys_in.can_have_more_than_min)
         {
           st.push_symbol(syms::estimate);
         }
 
       st.push_str_pair(syms::revision,
-                       boost::lexical_cast<string>(info->client.dryrun_incoming_revs));
+                       boost::lexical_cast<string>(info->revs_in.min_count));
       st.push_str_pair(syms::cert,
-                       boost::lexical_cast<string>(info->client.dryrun_incoming_certs));
+                       boost::lexical_cast<string>(info->certs_in.min_count));
       st.push_str_pair(syms::key,
-                       boost::lexical_cast<string>(info->client.dryrun_incoming_keys));
+                       boost::lexical_cast<string>(info->keys_in.min_count));
     }
   if (role != sink_role)
     {
@@ -376,14 +376,14 @@ print_dryrun_info_auto(protocol_role rol
       st.push_symbol(syms::send);
 
       st.push_str_pair(syms::revision,
-                       boost::lexical_cast<string>(info->client.outgoing_revs.size()));
+                       boost::lexical_cast<string>(info->revs_out.min_count));
       st.push_str_pair(syms::cert,
-                       boost::lexical_cast<string>(info->client.dryrun_outgoing_certs));
+                       boost::lexical_cast<string>(info->certs_out.min_count));
       st.push_str_pair(syms::key,
-                       boost::lexical_cast<string>(info->client.dryrun_outgoing_keys));
+                       boost::lexical_cast<string>(info->keys_out.min_count));
       map<branch_name, int> branch_counts;
-      for (vector<revision_id>::const_iterator i = info->client.outgoing_revs.begin();
-           i != info->client.outgoing_revs.end(); ++i)
+      for (vector<revision_id>::const_iterator i = info->revs_out.items.begin();
+           i != info->revs_out.items.end(); ++i)
         {
           set<branch_name> my_branches;
           project.get_revision_branches(*i, my_branches);
@@ -405,8 +405,7 @@ print_cert(cert const & item,
 
 static void
 print_cert(cert const & item,
-           basic_io::printer & pr,
-           std::ostream & output)
+           basic_io::printer & pr)
 {
   basic_io::stanza st;
   st.push_symbol(syms::cert);
@@ -415,7 +414,6 @@ print_cert(cert const & item,
   st.push_str_pair(syms::value, item.value());
   st.push_binary_pair(syms::key, item.key.inner());
   pr.print_stanza(st);
-  output.write(pr.buf.data(), pr.buf.size());
 }
 
 static void
@@ -434,35 +432,32 @@ print_info_auto(protocol_role role,
         basic_io::stanza st;
         st.push_symbol(syms::receive);
         pr.print_stanza(st);
-        output.write(pr.buf.data(), pr.buf.size());
       }
 
       {
         basic_io::stanza st;
-        for (vector<revision_id>::const_iterator i = info->client.incoming_revs.begin();
-             i != info->client.incoming_revs.end(); ++i)
+        for (vector<revision_id>::const_iterator i = info->revs_in.items.begin();
+             i != info->revs_in.items.end(); ++i)
           {
             st.push_binary_pair(syms::revision, i->inner());
           }
         pr.print_stanza(st);
-        output.write(pr.buf.data(), pr.buf.size());
       }
 
-      for (vector<cert>::const_iterator i = info->client.incoming_certs.begin();
-           i != info->client.incoming_certs.end(); ++i)
+      for (vector<cert>::const_iterator i = info->certs_in.items.begin();
+           i != info->certs_in.items.end(); ++i)
         {
-          print_cert(*i, pr, output);
+          print_cert(*i, pr);
         }
 
       {
         basic_io::stanza st;
-        for (vector<key_id>::const_iterator i = info->client.incoming_keys.begin();
-             i != info->client.incoming_keys.end(); ++i)
+        for (vector<key_id>::const_iterator i = info->keys_in.items.begin();
+             i != info->keys_in.items.end(); ++i)
           {
             st.push_binary_pair(syms::key, i->inner());
           }
         pr.print_stanza(st);
-        output.write(pr.buf.data(), pr.buf.size());
       }
     }
 
@@ -473,37 +468,36 @@ print_info_auto(protocol_role role,
         basic_io::stanza st;
         st.push_symbol(syms::send);
         pr.print_stanza(st);
-        output.write(pr.buf.data(), pr.buf.size());
       }
 
       {
         basic_io::stanza st;
-        for (vector<revision_id>::const_iterator i = info->client.outgoing_revs.begin();
-             i != info->client.outgoing_revs.end(); ++i)
+        for (vector<revision_id>::const_iterator i = info->revs_out.items.begin();
+             i != info->revs_out.items.end(); ++i)
           {
             st.push_binary_pair(syms::revision, i->inner());
           }
         pr.print_stanza(st);
-        output.write(pr.buf.data(), pr.buf.size());
       }
 
-      for (vector<cert>::const_iterator i = info->client.outgoing_certs.begin();
-           i != info->client.outgoing_certs.end(); ++i)
+      for (vector<cert>::const_iterator i = info->certs_out.items.begin();
+           i != info->certs_out.items.end(); ++i)
         {
-          print_cert(*i, pr, output);
+          print_cert(*i, pr);
         }
 
       {
         basic_io::stanza st;
-        for (vector<key_id>::const_iterator i = info->client.outgoing_keys.begin();
-             i != info->client.outgoing_keys.end(); ++i)
+        for (vector<key_id>::const_iterator i = info->keys_out.items.begin();
+             i != info->keys_out.items.end(); ++i)
           {
             st.push_binary_pair(syms::key, i->inner());
           }
         pr.print_stanza(st);
-        output.write(pr.buf.data(), pr.buf.size());
       }
     }
+
+  output.write(pr.buf.data(), pr.buf.size());
 }
 
 CMD(push, "push", "", CMD_REF(network),
============================================================
--- network/netsync_session.cc	980227d86979241f1d009ae502af589ecb59e732
+++ network/netsync_session.cc	9fa376cc67004a572fd57b5f2e2b17416b68d5ef
@@ -141,17 +141,6 @@ void netsync_session::on_end(size_t iden
             keys_in || keys_out))
     error_code = error_codes::partial_transfer;
 
-  if (is_automate)
-    {
-      // Save data for automate output
-      conn_info->client.outgoing_revs  = sent_revisions;
-      conn_info->client.outgoing_certs = sent_certs;
-      conn_info->client.outgoing_keys  = sent_keys;
-      conn_info->client.incoming_revs  = written_revisions;
-      conn_info->client.incoming_certs = written_certs;
-      conn_info->client.incoming_keys  = written_keys;
-    }
-
   // Call Lua hooks
   vector<cert> unattached_written_certs;
   map<revision_id, vector<cert> > rev_written_certs;
============================================================
--- network/netsync_session.hh	bc423b7029db3ce08c533108faab24e48e982e2f
+++ network/netsync_session.hh	cf060f720312e40d90a4457705d643c9fc959ec8
@@ -65,7 +65,6 @@ netsync_session:
 
   // dry-run & automate info
   bool is_dry_run;
-  bool is_automate;
   bool dry_run_keys_refined;
   shared_conn_info conn_info;
   bool dry_run_finished() const;