Commit d684ba86 authored by Chris McDonough's avatar Chris McDonough

Changed the conflict resolution machinery to avoid attempting to resolve...

Changed the conflict resolution machinery to avoid attempting to resolve conflicts on ZClasses, because we can't import their "modules" (we don't have a db connection).
parent 3f0e453f
......@@ -91,7 +91,11 @@ from ZODB.POSException import ConflictError
#import traceback
bad_classes={}
bad_class=bad_classes.has_key
def bad_class(class_tuple):
if bad_classes.has_key(class_tuple) or class_tuple[0][1] == '*':
# if we've seen the class before or if it's a ZClass, we know that
# we can't resolve the conflict
return 1
ResolvedSerial='rs'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment