| commit | b1a7653534ca2be0323739300e2232d168b679e8 | |
| author | James Hogan <james.hogan@imgtec.com> | |
| Fri, 13 Jun 2014 22:04:31 +0000 (13 23:04 +0100) | ||
| committer | Jonathan Corbet <corbet@lwn.net> | |
| Wed, 18 Jun 2014 21:21:18 +0000 (18 15:21 -0600) | ||
| tree | 63160105d92f527add3e6a2726d9d4f30a3fe892 | treesnapshot (tar.gz zip) |
| parent | c9740ec502ca62ace154523d82a1a6861cafa0e4 | commitdiff |
Fix ExtMerge pattern for tags and octopus branches
Fix the ExtMerge pattern to handle more merge subject forms:
- Multiple branches from URL:
Merge branches '...' and '...' of ...://...
- Merging tags from URL:
Merge tag '...' of ...://...
Merge tags '...' and '...' of ...://...
- Merging URL into specific branch:
Merge ... of ...://... into ...
This allows treeplot to pick up many more external merges, especially in
recent releases, that would otherwise have been treated as internal
merges and often been accounted for in [No tree].
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Fix the ExtMerge pattern to handle more merge subject forms:
- Multiple branches from URL:
Merge branches '...' and '...' of ...://...
- Merging tags from URL:
Merge tag '...' of ...://...
Merge tags '...' and '...' of ...://...
- Merging URL into specific branch:
Merge ... of ...://... into ...
This allows treeplot to pick up many more external merges, especially in
recent releases, that would otherwise have been treated as internal
merges and often been accounted for in [No tree].
Signed-off-by: James Hogan <james.hogan@imgtec.com>
| patterns.py | diffblobblamehistory | |
| treeplot | diffblobblamehistory |