svn commit: r1298364 - /subversion/trunk/tools/dev/mergegraph/mergegraph.py

[ju...@apache.org]

Author: julianfoad
Date: Thu Mar  8 11:21:45 2012
New Revision: 1298364

URL: http://svn.apache.org/viewvc?rev=1298364&view=rev
Log:
* tools/dev/mergegraph/mergegraph.py
  (MergeGraph.mk_merge_edge): Draw a dashed edge if the merge kind starts
    with 'cherry' rather than if it is exactly 'cherry'.

Modified:
    subversion/trunk/tools/dev/mergegraph/mergegraph.py

Modified: subversion/trunk/tools/dev/mergegraph/mergegraph.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/mergegraph/mergegraph.py?rev=1298364&r1=1298363&r2=1298364&view=diff
==============================================================================
--- subversion/trunk/tools/dev/mergegraph/mergegraph.py (original)
+++ subversion/trunk/tools/dev/mergegraph/mergegraph.py Thu Mar  8 11:21:45 2012
@@ -136,7 +136,7 @@ class MergeGraph(pydot.Graph):
              label='"' + label + '"',
              color=color, fontcolor=color,
              style='bold')
-    if kind == 'cherry':
+    if kind.startswith('cherry'):
       e.set_style('dashed')
     graph.add_edge(e)
 
@@ -158,7 +158,7 @@ class MergeGraph(pydot.Graph):
     """Add a merge"""
     base_node, src_node, tgt_node, kind = merge
 
-    if base_node and src_node:  # and kind != 'cherry':
+    if base_node and src_node:  # and not kind.startwith('cherry'):
       graph.mk_mergeinfo_edge(base_node, src_node, important)
 
     # Merge target node