[Checkins] SVN: zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py *** empty log message ***

[Jim Fulton]

Log message for revision 104591:
  *** empty log message ***

Changed:
  U   zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py

-=-
Modified: zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py
===================================================================
--- zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py	2009-09-28 17:03:45 UTC (rev 104590)
+++ zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py	2009-09-28 18:04:00 UTC (rev 104591)
@@ -112,13 +112,15 @@
 def mergelogs(l1, l2, out):
     files = open(l1, 'rb'), open(l2, 'rb')
     records = [marshal.load(f) for f in files]
+    counts = [0, 0]
     fo = open(out, 'wb')
     while 1:
         if records[0][1] <= records[1][1]:
             index = 0
         else:
             index = 1
-        marshal.dump(records[index], fo)
+        session, timetime, message = records[index]
+        marshal.dump(('%s%s' % (index, session), timetime, message), fo)
         try:
             records[index] = marshal.load(files[index])
         except EOFError: