/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-29 08:59:13 UTC
  • mfrom: (5193 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5218.
  • Revision ID: jelmer@samba.org-20100429085913-7208x0s3of34kehh
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

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