~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: 2011-05-19 09:19:47 UTC
mfrom: (5891.1.2 api-docs)
Revision ID: pqm@pqm.ubuntu.com-20110519091947-5u0csgddxucufsrm

(spiv) Update 'api-docs' make target to use pydoctor,
and fix the formatting of many docstrings. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

bzrlib/reconcile.py

"""Perform reconciliation.

After reconciliation the following attributes document found issues:

inconsistent_parents: The number of revisions in the repository whose

ancestry was being reported incorrectly.

garbage_inventories: The number of inventory objects without revisions

that were garbage collected.

fixed_branch_history: None if there was no branch, False if the branch

history was correct, True if the branch history

needed to be re-normalized.

* `inconsistent_parents`: The number of revisions in the repository

whose ancestry was being reported incorrectly.

* `garbage_inventories`: The number of inventory objects without

revisions that were garbage collected.

* `fixed_branch_history`: None if there was no branch, False if the

branch history was correct, True if the branch history needed to be

re-normalized.

"""

self.pb = ui.ui_factory.nested_progress_bar()

try:

196

197