Tarmac

Merge lp://qastaging/~james-w/tarmac/lock-contention into lp://qastaging/tarmac

  1. lock-contention
  2. Merge into main
Proposed by James Westby
Status: Superseded
Proposed branch: lp://qastaging/~james-w/tarmac/lock-contention
Merge into: lp://qastaging/tarmac
Prerequisite: lp://qastaging/~sidnei/tarmac/one-at-a-time
Diff against target: 67 lines (+3/-16)
1 file modified
tarmac/bin/commands.py (+3/-16)
To merge this branch: bzr merge lp://qastaging/~james-w/tarmac/lock-contention
Reviewer Review Type Date Requested Status
Paul Hummer Pending
Review via email: mp+144803@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-01-31.

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.
lp://qastaging/~james-w/tarmac/lock-contention updated
404. By James Westby

Merged one-at-a-time into lock-contention.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches