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

[nobody at svn.erp5.org]

Author: vincent
Date: Sat Aug 28 08:34:27 2010
New Revision: 2245

Log:
Resolver exceptions must be caught while undoing.

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] Sat Aug 28 08:34:27 2010
@@ -903,8 +903,11 @@ class Application(object):
             # Load the version we were undoing to
             undo_data, _ = loadBefore(oid, undone_tid)
             # Resolve conflict
-            new_data = tryToResolveConflict(oid, data_tid, undone_tid, undo_data,
-                data)
+            try:
+                new_data = tryToResolveConflict(oid, data_tid, undone_tid,
+                    undo_data, data)
+            except ConflictError:
+                new_data = None
             if new_data is None:
                 raise UndoError('Some data were modified by a later ' \
                     'transaction', oid)