def testChanges(self, ob):
"""
Test the specified object to determine if the change set
will apply without errors
"""
value = _getValue(ob, self.field)
if not self.same and value != self.oldValue:
raise ValueError("Conflict Error during merge", self.field, value, self.oldValue)
def testChanges(self, ob):
"""
Test the specified object to determine if the change set will
apply without errors
"""
value = _getValue(ob, self.field)
if not self.same and value != self.oldValue:
raise ValueError('Conflict Error during merge', self.field, value,
self.oldValue)