Merge lp://staging/~twom/loggerhead/use-rev-not-file-rev into lp://staging/loggerhead

Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: 505
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp://staging/~twom/loggerhead/use-rev-not-file-rev
Merge into: lp://staging/loggerhead
Diff against target: 14 lines (+1/-3)
1 file modified
loggerhead/controllers/view_ui.py (+1/-3)
To merge this branch: bzr merge lp://staging/~twom/loggerhead/use-rev-not-file-rev
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+387105@code.staging.launchpad.net

Commit message

Use current rev, not file rev

Description of the change

Looking up the file revision to get the tree doesn't work if the file is in a subdirectory that has moved.
Instead, use the revision that we've got from the URL to get the tree, then look up the file.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

I don't completely follow this, but I'm happy to give it a go and see if it works better in some of those corner cases.

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

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