# HG changeset patch
# User Frank Zschockelt <jdev@freakysoft.de>
# Date 1168015147 -3600
# Node ID de14c419b3239022de0decb6e6dd088753dd2607
# Parent  2ba26f6c060f2ff2f1ab8d3e13fc2059ed9a3595
Added merge_history.py to contrib

diff -r 2ba26f6c060f -r de14c419b323 mcabber/contrib/merge_history.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mcabber/contrib/merge_history.py	Fri Jan 05 17:39:07 2007 +0100
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# This script is provided under the terms of the GNU General Public License,
+# see the file COPYING in the root mcabber source directory.
+#
+# Frank Zschockelt, 05.01.2007
+
+import sys
+
+if(len(sys.argv) != 3):
+  print "usage:",sys.argv[0],"histA histB > histA+B"
+  sys.exit(0)
+file=open(sys.argv[1], "r")
+linesA=file.readlines()
+file.close()
+file=open(sys.argv[2], "r")
+linesB=file.readlines()
+file.close()
+
+i=j=0
+while(i<len(linesA) and j < len(linesB)):
+  if(linesA[i][3:20] <= linesB[j][3:20]):
+    l=int(linesA[i][22:25])
+    for s in linesA[i:i+l+1]:
+      print s,
+    if(linesA[i]==linesB[j]):
+      j+=l+1
+    i+=l+1
+  else:
+    l=int(linesB[j][22:25])
+    for s in linesB[j:j+l+1]:
+      print s,
+    j+=l+1
+
+for s in linesA[i:len(linesA)]:
+  print s,
+for s in linesB[j:len(linesB)]:
+  print s,
+