Changeset 521

Timestamp:

01/20/10 16:20:59 (2 years ago)

Author:

ged

Message:

add FIXME

Files:

• elixir/trunk/elixir/entity.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -965 +965 @@
         return self._descriptor.session.registry()
 
+    #FIXME: remove all deprecated methods, possibly all of these
     def merge(self, *args, **kwargs):
         return self._global_session.merge(self, *args, **kwargs)