Tarmac

Merge lp://staging/~james-w/tarmac/branch-tree-properties into lp://staging/tarmac

  1. branch-tree-properties
  2. Merge into main
Proposed by James Westby
Status: Rejected
Rejected by: dobey
Proposed branch: lp://staging/~james-w/tarmac/branch-tree-properties
Merge into: lp://staging/tarmac
Prerequisite: lp://staging/~james-w/tarmac/lock-contention
Diff against target: 274 lines (+80/-53)
2 files modified
tarmac/bin/commands.py (+7/-5)
tarmac/branch.py (+73/-48)
To merge this branch: bzr merge lp://staging/~james-w/tarmac/branch-tree-properties
Reviewer Review Type Date Requested Status
dobey Disapprove
Paul Hummer Approve
Review via email: mp+144805@code.staging.launchpad.net

Commit message

Don't keep an open branch/tree around for too long but reopen it instead.

Description of the change

Don't keep an open branch/tree around for too long but reopen it instead.

I believe this was to avoid failing if LP closes the connection during the
tests.

(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 :

The prerequisite lp:~james-w/tarmac/lock-contention has not yet been merged into lp:tarmac.

Revision history for this message
Paul Hummer (rockstar) wrote :

Attempt to merge into lp:tarmac failed due to conflicts:

text conflict in tarmac/branch.py

Revision history for this message
dobey (dobey) wrote :

Please create bugs for the issues, include tests, and split the changes into a branch or two which do not have unnecessary dependencies on other unrelated changes.

review: Disapprove

Unmerged revisions

406. By James Westby

Merge trunk.

405. By James Westby

Merged lock-contention into branch-tree-properties.

404. By James Westby

Use properties to get the branch and tree, rather than assigning at instaniation.

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