Merge lp://staging/~vila/bzr/1657238-wrong-import into lp://staging/bzr/2.7
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6622 |
Proposed branch: | lp://staging/~vila/bzr/1657238-wrong-import |
Merge into: | lp://staging/bzr/2.7 |
Diff against target: |
37 lines (+5/-5) 2 files modified
bzrlib/lazy_regex.py (+4/-4) doc/en/release-notes/bzr-2.7.txt (+1/-1) |
To merge this branch: | bzr merge lp://staging/~vila/bzr/1657238-wrong-import |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+315874@code.staging.launchpad.net |
Commit message
Properly monkey-patch re.finditer
Description of the change
The previous attempt was obviously broken (working but causing bug #1657238 in some contexts).
To post a comment you must log in.