← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_annotate_iter.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_annotate_iter.py
16
16
 
17
17
"""Tests for interface conformance of 'WorkingTree.annotate_iter'"""
18
18
 
19
 
import os
20
 
 
21
 
from bzrlib import (
22
 
    errors,
23
 
    inventory,
24
 
    osutils,
25
 
    tests,
26
 
    )
27
19
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
28
20
 
29
21