/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/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
18
18
 
19
19
import warnings
20
20
 
21
 
from breezy.lazy_import import lazy_import
 
21
from .lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
23
from breezy import (
24
24
    branch as _mod_branch,
42
42
    )
43
43
from breezy.i18n import gettext
44
44
""")
45
 
from breezy import (
 
45
from . import (
46
46
    decorators,
47
47
    errors,
48
48
    hooks,
49
49
    registry,
50
50
    )
51
 
from breezy.symbol_versioning import (
 
51
from .symbol_versioning import (
52
52
    deprecated_in,
53
53
    deprecated_method,
54
54
    )
2199
2199
        while True:
2200
2200
            next_lcas = self.graph.find_lca(*cur_ancestors)
2201
2201
            # Map a plain NULL_REVISION to a simple no-ancestors
2202
 
            if next_lcas == set([_mod_revision.NULL_REVISION]):
 
2202
            if next_lcas == {_mod_revision.NULL_REVISION}:
2203
2203
                next_lcas = ()
2204
2204
            # Order the lca's based on when they were merged into the tip
2205
2205
            # While the actual merge portion of weave merge uses a set() of