From 0f82cd871141a4ca465e171dd4eb0fe6a73058f6 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 2 Mar 2015 11:14:24 +0100
Subject: [PATCH] print revision numbers - not changesets - in warn-log

---
 src/node/handler/PadMessageHandler.js | 3 ++-
 src/static/js/Changeset.js            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index e585b6528..ac8904f8d 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -1635,7 +1635,8 @@ function composePadChangesets(padId, startNum, endNum, callback)
           changeset = Changeset.compose(changeset, cs, pool);
         }
       } catch(e){
-        console.warn("failed to compose cs in pad:",padId);
+        // r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3
+        console.warn("failed to compose cs in pad:",padId," startrev:",startNum," current rev:",r);
         return callback(e);
       }
 
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index c97756b8d..df180f9cf 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -1318,7 +1318,7 @@ exports.compose = function (cs1, cs2, pool) {
   var unpacked2 = exports.unpack(cs2);
   var len1 = unpacked1.oldLen;
   var len2 = unpacked1.newLen;
-  exports.assert(len2 == unpacked2.oldLen, "mismatched composition of two changesets - cs1:",cs1," and cs2:",cs2);
+  exports.assert(len2 == unpacked2.oldLen, "mismatched composition of two changesets");
   var len3 = unpacked2.newLen;
   var bankIter1 = exports.stringIterator(unpacked1.charBank);
   var bankIter2 = exports.stringIterator(unpacked2.charBank);