diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-04-12 23:41:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-04-12 23:41:19 +0000 |
| commit | b066c45dc491716a4e34bdeb9a9726bcbc136fb5 (patch) | |
| tree | ae40a051b41f73d3587cb1f2785c85e810e89dc7 /lib/sqlalchemy/orm/scoping.py | |
| parent | 53be3fc70a44d34fda1ffddcf9d67473d3de50b4 (diff) | |
| parent | ee7e49964fcf13ed0f5a3541b81f00302a9db29a (diff) | |
| download | sqlalchemy-b066c45dc491716a4e34bdeb9a9726bcbc136fb5.tar.gz | |
Merge "Remove old versionadded and versionchanged" into main
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
| -rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 787c5a4ab..19217ec32 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -1425,10 +1425,6 @@ class scoped_session(Generic[_S]): See :ref:`unitofwork_merging` for a detailed discussion of merging. - .. versionchanged:: 1.1 - :meth:`.Session.merge` will now reconcile - pending objects with overlapping primary keys in the same way - as persistent. See :ref:`change_3601` for discussion. - :param instance: Instance to be merged. :param load: Boolean, when False, :meth:`.merge` switches into a "high performance" mode which causes it to forego emitting history |