PQM

Merge lp:~thumper/pqm/queue-abstraction into lp:pqm

  1. queue-abstraction
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Merge reported by: Robert Collins
Merged at revision: 182
Proposed branch: lp:~thumper/pqm/queue-abstraction
Merge into: lp:pqm
To merge this branch: bzr merge lp:~thumper/pqm/queue-abstraction
Reviewer Review Type Date Requested Status
Robert Collins Disapprove
Review via email: mp+298@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

I merged it, with some massive conflicts. After resolving no tests were passing. I've fixed it up, but its still likely broken - I'm not at all sure I caught everything, didn't back stuff out accidentally etc. So I've pushed my merged branch up, but not landed it in mainline. It needs some more love I think before merging, so declining for now.

lp:~lifeless/pqm/queue-abstraction

review: Disapprove
Revision history for this message
Tim Penhey (thumper) wrote :

I've just remerged trunk, and resolve the conflicts and broken tests.

This should be good to go now.

lp:~thumper/pqm/queue-abstraction updated
179. By Tim Penhey

Merge trunk and resolve conflicts.

180. By Tim Penhey

Fix the lockfile test.

Subscribers

People subscribed via source and target branches