← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Aaron Bentley
  • Date: 2006-06-12 02:11:45 UTC
  • mfrom: (1759.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: aaron.bentley@utoronto.ca-20060612021145-0ced20f7791f3c66
Fix some typos (found using aspell) (Jelmer Vernooij).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
222
222
    def _parents_are_inconsistent(self, rev_id, parents):
223
223
        """Return True if the parents list of rev_id does not match the weave.
224
224
 
225
 
        This detect inconsistences based on the self.thorough value:
 
225
        This detects inconsistencies based on the self.thorough value:
226
226
        if thorough is on, the first parent value is checked as well as ghost
227
227
        differences.
228
228
        Otherwise only the ghost differences are evaluated.