878
878
raise errors.WeaveTextDiffers(name, self, other)
879
879
self_parents = self._parents[this_idx]
880
880
other_parents = other._parents[other_idx]
883
883
if not self._compatible_parents(n1, n2):
884
884
raise WeaveParentMismatch("inconsistent parents "
885
885
"for version {%s}: %s vs %s" % (name, n1, n2))