Enhance sqlite3session_apply() and sqlite3session_apply_strm() so that

conflicts are retried before the xConflict() callback is invoked, as long
as the "apply" operation is making forward progress.

FossilOrigin-Name: 42a219668413e18dae917b03b04a21d108cc44be

diff --cc manifest
index deae1a11e9b378c4b1f8dc953ea2fc53f7f0786c,61906ced3af370f93adf1cf8ab180bc0bca717cd..c98d80b73df07e133ae2ded944fe0329ea2c6b89
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Minor\sperformance\soptimization\sin\sthe\scomparison\sopcodes\sof\sthe\sVDBE.
- D 2016-04-04T13:46:24.704
 -C Add\sanother\sOOM\stest\sto\sthis\sbranch.
 -D 2016-03-31T15:08:10.284
++C Enhance\ssqlite3session_apply()\sand\ssqlite3session_apply_strm()\sso\sthat\nconflicts\sare\sretried\sbefore\sthe\sxConflict()\scallback\sis\sinvoked,\sas\slong\nas\sthe\s"apply"\soperation\sis\smaking\sforward\sprogress.
++D 2016-04-04T14:57:25.972
  F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc cde766eb7c27a7ca42000e66c5f0c37a17a05998
 +F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1480,7 -1482,7 +1482,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0213d6af84965676626c2fb4d78b4c74675207cc
- R 20833b687cd0398f4e539411826fc13a
 -P 195f3340ee4d870420e4f58d44300bab5436b920
 -R 553c882c4eb73691c7e02bdd576b9d70
 -U dan
 -Z 5ef40d72349254975dc55c844d6daff8
++P e375fe52cea7903c11ecef71c3452c67a96b663e 49763fc3ae2fb6117b0443ea28661568467f9bf2
++R 29983b81bb4a270732770d4dd854ff08
++T +closed 49763fc3ae2fb6117b0443ea28661568467f9bf2
 +U drh
- Z 68baca12d82e219ae03586c49d91929a
++Z eb92f633faf3f47383a6550496ee5fc7

diff --cc manifest.uuid
index b3dbcfbd15c78ed7af3ed2015d016e17462d67c2,9ba171f6ba05d3e4009977a7141eb63418026933..586be52a36448d443ec52d2e2e6d97e2067acfa8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e375fe52cea7903c11ecef71c3452c67a96b663e
 -49763fc3ae2fb6117b0443ea28661568467f9bf2
++42a219668413e18dae917b03b04a21d108cc44be