/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/bzr/knitrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2019-02-03 23:43:20 UTC
  • mfrom: (7267 work)
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190203234320-zbquyl9973hbujnb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/knitrepo.py
206
206
 
207
207
    def reconcile(self, other=None, thorough=False):
208
208
        """Reconcile this repository."""
209
 
        from breezy.reconcile import KnitReconciler
 
209
        from .reconcile import KnitReconciler
210
210
        with self.lock_write():
211
211
            reconciler = KnitReconciler(self, thorough=thorough)
212
 
            reconciler.reconcile()
213
 
            return reconciler
 
212
            return reconciler.reconcile()
214
213
 
215
214
    def _make_parents_provider(self):
216
215
        return _KnitsParentsProvider(self.revisions)