]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- fixed bug preventing merge() from functioning in
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 3 Jun 2008 14:30:42 +0000 (14:30 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 3 Jun 2008 14:30:42 +0000 (14:30 +0000)
commit6bd2a1d804f179f365b3ebdb4adf79b6f50f4fb7
treebaa9fbcca5ea21f5c28b33c461f93b90d848b9b9
parent1c14de62151e1bbae0b9f61092f9fbad34865c94
- fixed bug preventing merge() from functioning in
conjunction with a comparable_property()
CHANGES
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/properties.py
test/orm/merge.py