save Merged Info

diff --git a/gitLog2tikz.py b/gitLog2tikz.py
index 99051f17d81d2444482615762f67ebb22fb95247..bbced7606d85f6bd564e90e9d468282ed2fc5fb6 100644 (file)
--- a/gitLog2tikz.py
+++ b/gitLog2tikz.py
@@ -175,7 +175,7 @@ class Repo:
             self._children = {}
             self._parents = {}
             self._message= None
-            self._node_color = None
+            #self._node_color = None
             self._author = None
             self._date = None
             self._hash = Hash(hashes[0])
@@ -195,12 +195,14 @@ class Repo:
             elif info[0] == 'Date':
                 tmp = ':'.join(info[1:]).strip().split(' ')
                 self._date = tmp[2] + ' ' + tmp[1] + ' ' + tmp[4]
+            elif info[0] == 'Merge':
+                self._merge = info[1].strip().split(' ')
             elif line[0:4] == '    ':
                 if(self._message):
                     self._message = self._message + "\n" + line[4:]
                 else:
                     self._message = line[4:]
-            elif line.replace(' ','') == '' or info[0] == 'Merge':
+            elif line.replace(' ','') == '':
                 NotImplemented
             else:
                 raise ValueError('Unkown format: ' + line)

diff --git a/text-output.pdf b/text-output.pdf
index d686f0fca7ef84c8dcd69551b1dcb0df26f42ea7..b218bdd505258c9c3ba5bd52c5a8a519c35dddaf 100644 (file)
Binary files a/text-output.pdf and b/text-output.pdf differ