diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2009-02-10 13:52:58 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2009-02-10 13:52:58 -0700 |
| commit | 50e3f2e1eeaec1793c6be8784ec79c392ff681d2 (patch) | |
| tree | 97afe3c8acf8b12a4bb3ffb5592b98f50d372f96 /patterns.py | |
| parent | f3fd6b568307871bb7213d32412afce8e6f479e2 (diff) | |
A quick and dirty treeplot utility
This is a tool to make a graphviz input file describing the patch flow into
the mainline.
Diffstat (limited to 'patterns.py')
| -rw-r--r-- | patterns.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patterns.py b/patterns.py index 4f878d0..1e81869 100644 --- a/patterns.py +++ b/patterns.py @@ -33,6 +33,6 @@ Preptest = re.compile (r'reported-and-tested-by:' + Pemail, re.I) # # Merges are described with a variety of lines. # -PExtMerge = re.compile(r'^ +Merge( branch .* of)? ([^ ]+)\n$') +PExtMerge = re.compile(r'^ +Merge( branch .* of)? ([^ ]+:[^ ]+)\n$') PIntMerge = re.compile(r'^ +(Merge|Pull) .* into .*$') PIntMerge2 = re.compile(r"^ +Merge branch(es)? '.*$") |