/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 bzrlib/reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-30 11:03:59 UTC
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430110359-ow3e3grh7sxy93pa
Remove more unused imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
96
96
    def _reconcile_repository(self):
97
97
        self.repo = self.bzrdir.find_repository()
98
98
        ui.ui_factory.note('Reconciling repository %s' %
99
 
            self.repo.user_url)
 
99
            self.repo.bzrdir.root_transport.base)
100
100
        self.pb.update("Reconciling repository", 0, 1)
101
101
        repo_reconciler = self.repo.reconcile(thorough=True)
102
102
        self.inconsistent_parents = repo_reconciler.inconsistent_parents