/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 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/reconcile.py
27
27
    ]
28
28
 
29
29
 
30
 
from bzrlib import (
 
30
from breezy import (
31
31
    cleanup,
32
32
    errors,
33
33
    revision as _mod_revision,
34
34
    ui,
35
35
    )
36
 
from bzrlib.trace import mutter
37
 
from bzrlib.tsort import topo_sort
38
 
from bzrlib.versionedfile import AdapterFactory, FulltextContentFactory
39
 
from bzrlib.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):
118
118
            ui.ui_factory.note(gettext(
119
119
                'Reconcile aborted: revision index has inconsistent parents.'))
120
120
            ui.ui_factory.note(gettext(
121
 
                'Run "bzr check" for more details.'))
 
121
                'Run "brz check" for more details.'))
122
122
        else:
123
123
            ui.ui_factory.note(gettext('Reconciliation complete.'))
124
124