← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-05-20 09:27:48 UTC
  • mfrom: (5241.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20100520092748-oa7knubtqio8l2rc
(lifeless) Merge 2.1 into trunk with a number of fixes including pyrex 0.9.9
 support. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
30
30
    cleanup,
31
31
    errors,
32
32
    ui,
33
 
    repository,
34
33
    )
35
34
from bzrlib.trace import mutter
36
35
from bzrlib.tsort import topo_sort
97
96
    def _reconcile_repository(self):
98
97
        self.repo = self.bzrdir.find_repository()
99
98
        ui.ui_factory.note('Reconciling repository %s' %
100
 
            self.repo.bzrdir.root_transport.base)
 
99
            self.repo.user_url)
101
100
        self.pb.update("Reconciling repository", 0, 1)
102
101
        repo_reconciler = self.repo.reconcile(thorough=True)
103
102
        self.inconsistent_parents = repo_reconciler.inconsistent_parents