Merge lp://qastaging/~jelmer/bzrtools/fix-bzr.dev-compat into lp://qastaging/bzrtools

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 777
Proposed branch: lp://qastaging/~jelmer/bzrtools/fix-bzr.dev-compat
Merge into: lp://qastaging/bzrtools
Diff against target: 62 lines (+21/-4)
3 files modified
tests/blackbox.py (+11/-2)
tests/test_link_tree.py (+6/-1)
tests/upstream_import.py (+4/-1)
To merge this branch: bzr merge lp://qastaging/~jelmer/bzrtools/fix-bzr.dev-compat
Reviewer Review Type Date Requested Status
Aaron Bentley Approve
Jonathan Riddell (community) Approve
Review via email: mp+73156@code.qastaging.launchpad.net

Description of the change

Cope with HardlinkFeature having moved to bzrlib.tests.features in bzr.dev.

To post a comment you must log in.
778. By Jelmer Vernooij

Fix deprecation warnings.

Revision history for this message
Jonathan Riddell (jr) wrote :

all good

review: Approve
Revision history for this message
Aaron Bentley (abentley) wrote :

Merged. Thanks!

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