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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/reconcile.py
27
27
    ]
28
28
 
29
29
 
30
 
from brzlib import (
 
30
from breezy import (
31
31
    cleanup,
32
32
    errors,
33
33
    revision as _mod_revision,
34
34
    ui,
35
35
    )
36
 
from brzlib.trace import mutter
37
 
from brzlib.tsort import topo_sort
38
 
from brzlib.versionedfile import AdapterFactory, FulltextContentFactory
39
 
from brzlib.i18n import gettext
 
36
from breezy.trace import mutter
 
37
from breezy.tsort import topo_sort
 
38
from breezy.versionedfile import AdapterFactory, FulltextContentFactory
 
39
from breezy.i18n import gettext
40
40
 
41
41
 
42
42
def reconcile(dir, canonicalize_chks=False):