#
#
# patch "netsync.cc"
#  from [8aa8a063c4a6a506a7e30d2e1ff85a38da445253]
#    to [242db29a907074ece464b76f2bdccfc4ccaffe17]
#
============================================================
--- netsync.cc	8aa8a063c4a6a506a7e30d2e1ff85a38da445253
+++ netsync.cc	242db29a907074ece464b76f2bdccfc4ccaffe17
@@ -2268,12 +2268,16 @@ session::process_data_cmd(netcmd_item_ty
             // It is safe to call 'error' here, because if we get here,
             // then the current netcmd packet cannot possibly have
             // written anything to the database.
+            hexenc<data> my_epoch;
+            hexenc<data> their_epoch;
+            encode_hexenc(i->second.inner(), my_epoch);
+            encode_hexenc(epoch.inner(), their_epoch);
             error(mixing_versions,
                   (F("Mismatched epoch on branch %s."
                      " Server has '%s', client has '%s'.")
                    % branch
-                   % (voice == server_voice ? i->second : epoch)
-                   % (voice == server_voice ? epoch : i->second)).str());
+                   % (voice == server_voice ? my_epoch : their_epoch)()
+                   % (voice == server_voice ? their_epoch : my_epoch)()).str());
           }
       }
       maybe_note_epochs_finished();