← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2008-04-30 13:32:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3394.
  • Revision ID: john@arbash-meinel.com-20080430133215-t1x69j3vg01yu3i0
Review comments from Ian

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
795
795
    @needs_write_lock
796
796
    def reconcile(self, thorough=True):
797
797
        """Make sure the data stored in this branch is consistent."""
798
 
        """Reconcile this repository."""
799
798
        from bzrlib.reconcile import BranchReconciler
800
799
        reconciler = BranchReconciler(self, thorough=thorough)
801
800
        reconciler.reconcile()