[Neo-report] r2016 vincent - /trunk/neo/client/app.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Apr 23 17:20:38 2010
New Revision: 2016

Log:
Fix r2015: it mistakenly replaced the whole dict by a serial.

Modified:
    trunk/neo/client/app.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Fri Apr 23 17:20:38 2010
@@ -608,7 +608,7 @@
                     data)
                 if new_data is not None:
                     # Mark this conflict as resolved
-                    local_var.resolved_conflict_serial_dict = \
+                    local_var.resolved_conflict_serial_dict[oid] = \
                         local_var.conflict_serial_dict.pop(oid)
                     # Try to store again
                     self.store(oid, conflict_serial, new_data, version,