← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

Move doctest import to increase speed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
20
20
__all__ = ['reconcile', 'Reconciler', 'RepoReconciler', 'KnitReconciler']
21
21
 
22
22
 
23
 
from bzrlib import ui
 
23
import bzrlib.branch
 
24
import bzrlib.errors as errors
 
25
import bzrlib.progress
24
26
from bzrlib.trace import mutter
25
27
from bzrlib.tsort import TopoSorter
 
28
import bzrlib.ui as ui
26
29
 
27
30
 
28
31
def reconcile(dir, other=None):