]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- merged r6553 from trunk
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 14 Dec 2009 01:34:06 +0000 (01:34 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 14 Dec 2009 01:34:06 +0000 (01:34 +0000)
commitcd464c7aac765f65c032cf1f6a6a59010b7f1607
treeed728f61ad864116c9051e3461eeae52d656aa45
parenta8024fffce6493e4a784c1dfa2f63e12471bb681
- merged r6553 from trunk
- Session.merge() now properly overwrites a many-to-one or
uselist=False attribute to None if the attribute
is also None in the given object to be merged.
CHANGES
lib/sqlalchemy/orm/properties.py
test/orm/test_merge.py