]> git.ipfire.org Git - thirdparty/sqlite.git/commit
projects / thirdparty / sqlite.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd45374) | patch
Fix rebasing of UPDATE changes against a set of remote changesets that feature
authordan <dan@noemail.net>
Wed, 21 Mar 2018 17:29:53 +0000 (17:29 +0000)
committerdan <dan@noemail.net>
Wed, 21 Mar 2018 17:29:53 +0000 (17:29 +0000)
commit24a0c4534aa0f8be54ecd47050fb0bd71e9cb7bf
tree9505e82bb9b63e91e02c22bedc890df7bd45c531tree | snapshot
parentbd45374cc88be68f6cead54858427184443d50bfcommit | diff
Fix rebasing of UPDATE changes against a set of remote changesets that feature
both OMIT and REPLACE conflict resolution on different fields of the same row.

FossilOrigin-Name: d8bc3fdb6ba165ca8d7cab857ede8e7e6e2fac24ad59580c5e1db1a4942d295c
ext/session/sessionrebase.test diff | blob | blame | history
ext/session/sqlite3session.c diff | blob | blame | history
ext/session/sqlite3session.h diff | blob | blame | history
manifest diff | blob | blame | history
manifest.uuid diff | blob | blame | history
Mirror of https://github.com/sqlite/sqlite.git