/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/branch.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/branch.py
1414
1414
        return tree
1415
1415
 
1416
1416
    def reconcile(self, thorough=True):
1417
 
        """Make sure the data stored in this branch is consistent."""
1418
 
        from breezy.reconcile import BranchReconciler
1419
 
        with self.lock_write():
1420
 
            reconciler = BranchReconciler(self, thorough=thorough)
1421
 
            reconciler.reconcile()
1422
 
            return reconciler
 
1417
        """Make sure the data stored in this branch is consistent.
 
1418
 
 
1419
        :return: A `ReconcileResult` object.
 
1420
        """
 
1421
        raise NotImplementedError(self.reconcile)
1423
1422
 
1424
1423
    def reference_parent(self, path, file_id=None, possible_transports=None):
1425
1424
        """Return the parent branch for a tree-reference file_id