/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: John Arbash Meinel
  • Date: 2006-06-18 18:56:23 UTC
  • mfrom: (1790 +trunk)
  • mto: (1711.7.2 win32)
  • mto: This revision was merged to the branch mainline in revision 1796.
  • Revision ID: john@arbash-meinel.com-20060618185623-854bdd0fbc4f230f
[merge] bzr.dev 1790

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.