Merge lp:~bzr/bzr/475585-lp-proxy-py24-compat into lp:bzr
Proposed by
John A Meinel
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~bzr/bzr/475585-lp-proxy-py24-compat |
Merge into: | lp:bzr |
Diff against target: |
43 lines (+13/-2) 2 files modified
NEWS (+7/-0) bzrlib/plugins/launchpad/lp_registration.py (+6/-2) |
To merge this branch: | bzr merge lp:~bzr/bzr/475585-lp-proxy-py24-compat |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | Pending | ||
Review via email: mp+14492@code.launchpad.net |
To post a comment you must log in.
This is Vincent's fix for XMLTransport not being compatible with python2.4 with a couple of small updates. The main one is to just move the NEWS entry to the right location.
I still don't have a good answer for Daggy Fixes + NEWS entries. Because you really need NEWS to be part of the statement where the patch *lands* and not where it was *based* on...
Anyway, since Vincent was happy with that fix, and *I'm* happy with the small comment tweaks here, I'm going to land this.
Now we just need to figure out what to do about 2.1.0b3. I *definitely* want to release it ahead of schedule, since this is a serious regression.
But do we just release it straight from an updated bzr.dev, or do we just apply this patch onto 2.1.0b2 and release that immediately.