[Checkins] SVN: zc.queue/branches/andrew-conflict-resolution-persistent/src/zc/queue/_queue.py revert wrong commit.
Andrew Sung
asung at zope.com
Tue Jan 10 20:21:12 UTC 2012
Log message for revision 124015:
revert wrong commit.
Changed:
U zc.queue/branches/andrew-conflict-resolution-persistent/src/zc/queue/_queue.py
-=-
Modified: zc.queue/branches/andrew-conflict-resolution-persistent/src/zc/queue/_queue.py
===================================================================
--- zc.queue/branches/andrew-conflict-resolution-persistent/src/zc/queue/_queue.py 2012-01-10 20:20:01 UTC (rev 124014)
+++ zc.queue/branches/andrew-conflict-resolution-persistent/src/zc/queue/_queue.py 2012-01-10 20:21:12 UTC (rev 124015)
@@ -154,11 +154,9 @@
# we only know how to merge _data. If anything else is different,
# puke.
if set(committedstate.keys()) != set(newstate.keys()):
- print "ZCQUEUE WRONG ATTR"
raise ConflictError # can't resolve
for key, val in newstate.items():
if key != '_data' and val != committedstate[key]:
- print "ZCQUEUE ATTR DIFF"
raise ConflictError # can't resolve
# basically, we are ok with anything--willing to merge--
# unless committedstate and newstate have one or more of the
@@ -187,7 +185,6 @@
# cleaned out by the parent in one of the two new transactions.
# We can't know for sure, so we take the conservative route of
# refusing to be resolvable.
- print "ZCQUEUE EMPTYING BUCKET"
raise ConflictError
committed_added = committed_set - old_set
@@ -197,11 +194,9 @@
if new_removed & committed_removed:
# they both removed (claimed) the same one. Puke.
- print "ZCQUEUE BOTH REMOVED"
raise ConflictError # can't resolve
elif new_added & committed_added:
# they both added the same one. Puke.
- print "ZCQUEUE BOTH ADDED"
raise ConflictError # can't resolve
# Now we do the merge. We'll merge into the committed state and
# return it.
More information about the checkins
mailing list