]> git.ipfire.org Git - thirdparty/sqlite.git/commit
projects / thirdparty / sqlite.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b419a92) | patch
Change to five conflict resolution algorithms: ROLLBACK, ABORT, FAIL,
authordrh <drh@noemail.net>
Thu, 31 Jan 2002 15:54:21 +0000 (15:54 +0000)
committerdrh <drh@noemail.net>
Thu, 31 Jan 2002 15:54:21 +0000 (15:54 +0000)
commit1c92853dac621a7fdf97d005c90eddd8348c22d8
tree32479d739639afb04b78b4e8500c77d6d6152410tree | snapshot
parentb419a926d4498b79ac9f177d855722ce6807c9d1commit | diff
Change to five conflict resolution algorithms: ROLLBACK, ABORT, FAIL,
IGNORE, and REPLACE.  This checkin is code only.  Documentation and
tests are still needed.  Also, ABORT is not fully implemented. (CVS 360)

FossilOrigin-Name: d0e7cf4a83e6abad7129bed356b7492dddaff474
17 files changed:
manifest diff | blob | blame | history
manifest.uuid diff | blob | blame | history
publish.sh diff | blob | blame | history
src/build.c diff | blob | blame | history
src/delete.c diff | blob | blame | history
src/insert.c diff | blob | blame | history
src/main.c diff | blob | blame | history
src/parse.y diff | blob | blame | history
src/sqliteInt.h diff | blob | blame | history
src/tokenize.c diff | blob | blame | history
src/update.c diff | blob | blame | history
src/vdbe.c diff | blob | blame | history
test/conflict.test diff | blob | blame | history
test/copy.test diff | blob | blame | history
test/notnull.test diff | blob | blame | history
www/download.tcl diff | blob | blame | history
www/lang.tcl diff | blob | blame | history
Mirror of https://github.com/sqlite/sqlite.git