Merge lp:~mbp/bzr/733136-lock_url into lp:bzr/2.3
Proposed by
Martin Pool
Status: | Merged |
---|---|
Approved by: | Martin Pool |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5634 |
Proposed branch: | lp:~mbp/bzr/733136-lock_url |
Merge into: | lp:bzr/2.3 |
Diff against target: |
58 lines (+16/-7) 2 files modified
bzrlib/lockdir.py (+12/-7) doc/en/release-notes/bzr-2.3.txt (+4/-0) |
To merge this branch: | bzr merge lp:~mbp/bzr/733136-lock_url |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
John A Meinel | Pending | ||
Review via email: mp+55706@code.launchpad.net |
This proposal supersedes a proposal from 2011-03-31.
Commit message
avoid UnboundLocal error when locking fails (bug 733136)
Description of the change
This fixes bug 733136 by just moving the variable declaration to a place it will definitely be seen.
To post a comment you must log in.
The fix isn't especially shallow, but I am for not writing a test for it. If people feel I should, I can.