Merge lp://qastaging/~james-w/tarmac/lock-contention into lp://qastaging/tarmac
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Approved by: | Paul Hummer |
| Approved revision: | 404 |
| Merged at revision: | 405 |
| Proposed branch: | lp://qastaging/~james-w/tarmac/lock-contention |
| Merge into: | lp://qastaging/tarmac |
| Prerequisite: | lp://qastaging/~james-w/tarmac/one-at-a-time |
| Diff against target: |
21 lines (+3/-1) 1 file modified
tarmac/bin/commands.py (+3/-1) |
| To merge this branch: | bzr merge lp://qastaging/~james-w/tarmac/lock-contention |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Hummer | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-01-31.
Commit message
Ignore LockContention errors when trying to merge a branch.
Description of the change
Ignore LockContention errors when trying to merge a branch.
(from the u1 fork)
To post a comment you must log in.
Revision history for this message
| Paul Hummer (rockstar) | # |
review:
Approve
Revision history for this message
| Paul Hummer (rockstar) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The prerequisite lp:~james-w/tarmac/one-at-a-time has not yet been merged into lp:tarmac.