← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Robert Collins
  • Date: 2006-08-08 23:19:29 UTC
  • mfrom: (1884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1912.
  • Revision ID: robertc@robertcollins.net-20060808231929-4e3e298190214b3a
current status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
20
20
__all__ = ['reconcile', 'Reconciler', 'RepoReconciler', 'KnitReconciler']
21
21
 
22
22
 
23
 
import bzrlib.branch
24
 
import bzrlib.errors as errors
25
 
import bzrlib.progress
 
23
from bzrlib import ui
26
24
from bzrlib.trace import mutter
27
25
from bzrlib.tsort import TopoSorter
28
 
import bzrlib.ui as ui
29
26
 
30
27
 
31
28
def reconcile(dir, other=None):
222
219
    def _parents_are_inconsistent(self, rev_id, parents):
223
220
        """Return True if the parents list of rev_id does not match the weave.
224
221
 
225
 
        This detect inconsistences based on the self.thorough value:
 
222
        This detects inconsistencies based on the self.thorough value:
226
223
        if thorough is on, the first parent value is checked as well as ghost
227
224
        differences.
228
225
        Otherwise only the ghost differences are evaluated.