[Monotone-commits-diffs] net.venge.monotone.string-sanitization: f647de3d27ab4aa59acd76bb59a9de66636bf3dd

[code]

revision:            f647de3d27ab4aa59acd76bb59a9de66636bf3dd
date:                2011-03-08T11:14:28
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.string-sanitization
changelog:
* src/network/netsync_session.cc (process_data_cmd): Correct quoting.

manifest:
format_version "1"

new_manifest [339a250f5e55bf827ab8a3a318f7d9f42bbf56c6]

old_revision [3d96895e9ff2ea7d2eaa5ad2c46f60cfbf146461]

patch "src/network/netsync_session.cc"
 from [2c9ac6ccefe471f1ba7e1f261715501375cc0c0f]
   to [d2a9eee38bb3018fd84c699070f8e28557da6cc9]
============================================================
--- src/network/netsync_session.cc	2c9ac6ccefe471f1ba7e1f261715501375cc0c0f
+++ src/network/netsync_session.cc	d2a9eee38bb3018fd84c699070f8e28557da6cc9
@@ -975,8 +975,8 @@ netsync_session::process_data_cmd(netcmd
             encode_hexenc(epoch.inner(), their_epoch);
             bool am_server = (get_voice() == server_voice);
             error(error_codes::mixing_versions,
-                  (F("mismatched epoch on branch %s."
-                     " Server has '%s', client has '%s'")
+                  (F("mismatched epoch on branch '%s'."
+                     " Server has %s, client has %s")
                    % branch
                    % (am_server ? my_epoch : their_epoch)()
                    % (am_server ? their_epoch : my_epoch)()).str());