~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Robert Collins
  • Date: 2006-02-25 05:48:54 UTC
  • mto: (1587.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1588.
  • Revision ID: robertc@robertcollins.net-20060225054854-2f9e99cd1469d8c2
Make reconcile work with shared repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
59
59
                             that were garbage collected.
60
60
        """
61
61
        self.pb = ui.ui_factory.progress_bar()
62
 
        self.repo = self.bzrdir.open_repository()
 
62
        self.repo = self.bzrdir.find_repository()
63
63
        self.repo.lock_write()
64
64
        try:
65
65
            self.pb.note('Reconciling repository %s',