/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/tests/test_workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-11 12:19:56 UTC
  • mfrom: (6986.2.4 git-graduate)
  • Revision ID: breezy.the.bot@gmail.com-20180811121956-vg4h6snulccpy99e
Move git support to breezy.git.

Merged from https://code.launchpad.net/~jelmer/brz/git-graduate/+merge/348051

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_workingtree.py
28
28
    ZERO_SHA,
29
29
    )
30
30
 
31
 
from .... import (
 
31
from ... import (
32
32
    conflicts as _mod_conflicts,
33
33
    )
34
 
from ....delta import TreeDelta
 
34
from ...delta import TreeDelta
35
35
from ..mapping import (
36
36
    default_mapping,
37
37
    GitFileIdMap,
43
43
from ..workingtree import (
44
44
    FLAG_STAGEMASK,
45
45
    )
46
 
from ....tests import (
 
46
from ...tests import (
47
47
    TestCase,
48
48
    TestCaseWithTransport,
49
49
    )