Merge lp://staging/~wgrant/loggerhead/fix-merge-point-recursion into lp://staging/loggerhead
Proposed by
William Grant
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 490 | ||||
| Proposed branch: | lp://staging/~wgrant/loggerhead/fix-merge-point-recursion | ||||
| Merge into: | lp://staging/loggerhead | ||||
| Diff against target: |
35 lines (+4/-14) 1 file modified
loggerhead/history.py (+4/-14) |
||||
| To merge this branch: | bzr merge lp://staging/~wgrant/loggerhead/fix-merge-point-recursion | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Rework get_merge_
Description of the change
Rework get_merge_
Fixes "maximum recursion depth exceeded" exceptions on exceptionally
deep and exceedingly recursive histories.
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
