Merge lp://staging/~jelmer/loggerhead/import-fix-2 into lp://staging/loggerhead

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Albisetti
Approved revision: 426
Merged at revision: 425
Proposed branch: lp://staging/~jelmer/loggerhead/import-fix-2
Merge into: lp://staging/loggerhead
Diff against target: 29 lines (+8/-1)
2 files modified
__init__.py (+7/-1)
setup.py (+1/-0)
To merge this branch: bzr merge lp://staging/~jelmer/loggerhead/import-fix-2
Reviewer Review Type Date Requested Status
Martin Albisetti Approve
Review via email: mp+26382@code.staging.launchpad.net

Description of the change

This fixes another issue with the testsuite when loggerhead is installed - we don't install bzrlib.plugins.loggerhead.loggerhead.tests, only loggerhead.tests. This makes the testsuite code check for both (the first might not be available if somebody has loggerhead installed only in ~/.bazaar/plugins).

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

Looks ok to me, though I think you have your sense reversed in the cover letter.

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