Merge lp://staging/~jelmer/loggerhead/breezy-compat-1 into lp://staging/loggerhead

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 496
Proposed branch: lp://staging/~jelmer/loggerhead/breezy-compat-1
Merge into: lp://staging/loggerhead
Diff against target: 361 lines (+97/-53)
6 files modified
loggerhead/controllers/filediff_ui.py (+44/-22)
loggerhead/controllers/revision_ui.py (+6/-4)
loggerhead/controllers/view_ui.py (+9/-8)
loggerhead/history.py (+28/-12)
loggerhead/main.py (+4/-1)
loggerhead/tests/test_controllers.py (+6/-6)
To merge this branch: bzr merge lp://staging/~jelmer/loggerhead/breezy-compat-1
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Loggerhead Reviewers Pending
Review via email: mp+377809@code.staging.launchpad.net

Commit message

Fix compatibility with newer versions of Breezy.

Description of the change

Fix compatibility with newer versions of Breezy.

Newer versions of Breezy have removed file ids from most of the public API, to
accomodate formats that don't have file ids (like Git).

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

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