Resolver exceptions must be caught while undoing.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2245 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/app.py

@@ -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)