Incremental merge to prevent a huge pileup of merge conflicts resulting

from editing the same code in two different branches.

FossilOrigin-Name: 82c4c4e248bfca38bc3285d5a8414f7180c2eab5

diff --cc manifest
index 8a4d8c6eb7e3f49ffc3a251447777c5ed0743f1a,df5da3164fe072224a8e540068e011064d55fa03..7cc669799322158fde18f97eb9ae17e73a05d1e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Move\sthe\sos_unix.c\sfile\scloser\sto\strunk.
- D 2015-02-19T02:43:19.628
 -C Move\sthe\sos_unix.c\sfile\scloser\sto\sapple-osx.
 -D 2015-02-19T02:43:02.884
++C Incremental\smerge\sto\sprevent\sa\shuge\spileup\sof\smerge\sconflicts\sresulting\nfrom\sediting\sthe\ssame\scode\sin\stwo\sdifferent\sbranches.
++D 2015-02-19T15:56:27.502
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -217,11 -214,11 +217,11 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 56b0830336d47860be19610d057548c6303733c8
 -F src/os_unix.c 9922c8f5b2e32c0f0be2292feca5f72d88f6a833
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
++F src/os_unix.c e9666eb40f1dd211c362b08d595790acc7a02a62
 +F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
  F src/parse.y 0f8e7d60f0ab3cb53d270adef69259ac307d83a8
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
@@@ -233,13 -230,12 +233,13 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
 +F src/select.c 66c2fce5d5a413915c2c3d989e2bc00e5e905f00
  F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
- F src/sqlite.h.in 886a2a306f811f06ede879493731dfe991224a6e
 -F src/sqlite.h.in b02d8d19c5adc73bd02b225054103247aff64425
++F src/sqlite.h.in 6983c500b35cceeb8058292f593a18797e0c5cca
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
 +F src/sqliteInt.h 399d21875c6ae7b03b09b8e97ff639719fccc095
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -258,8 -254,8 +258,8 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c e7b2e1634324d746aa5e1c7e0929470e8be27953
 +F src/test_config.c 90441a025b77cf7831dab8ed94b3692115ed965a
- F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
+ F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
  F src/test_func.c 14e543ae4d905ee31dc322b2f8d31bfac1769d45
@@@ -1244,7 -1239,7 +1244,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5147b94ae6dc3e1bae5c506563347880c3a302b1
- R 6b3cfa6d91c403080a3780789432dd25
 -P 28284ccc0d7301503f6d2d7bee9093738d52e331
 -R de5d87b1cb4f744ff7cb90b036adcd40
++P 57d7024007c2a71bf6cb875b1f1daf26924d188e 81f242e338d6122e27aad86986bfd140012c6582
++R 788417e399f877a510499bdc109cf276
  U drh
- Z 90d307cc802c08c29ee77dea9a89c868
 -Z 45842533d15e073070e1f1a9e9241135
++Z 8131997588d15bedfe4c84b3279820f9

diff --cc manifest.uuid
index c00c40037e26182c5e86c33f2d1a7ddebe204101,084bab91e8cc158dede43339e7299f08baa776c4..891cc723564df212abb21d313c6ddd36d3fc10c1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 57d7024007c2a71bf6cb875b1f1daf26924d188e
 -81f242e338d6122e27aad86986bfd140012c6582
++82c4c4e248bfca38bc3285d5a8414f7180c2eab5

diff --cc src/os_unix.c
index 5b5b83e743e668d7a51e88b5dff88d52506c8d8b,d81618f610cfb69e984b23d0d2093e3dba7d70f7..8e55f3d46edb322c94f68006eccb01473e804af6
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -5446,14 -4691,9 +5446,13 @@@ static int unixShmUnmap
    assert( pShmNode->nRef>0 );
    pShmNode->nRef--;
    if( pShmNode->nRef==0 ){
 -    if( deleteFlag && pShmNode->h>=0 ){
 -      osUnlink(pShmNode->zFilename);
 +    if( deleteFlag && pShmNode->h>=0 ) {
 +      if (deleteFlag == 1) { 
 +        osUnlink(pShmNode->zFilename);
 +      } else if (deleteFlag == 2) {
 +        /* ftruncate(pShmNode->h, 32 * 1024); */
 +      }
      }
-     
      unixShmPurge(pDbFd);
    }
    unixLeaveMutex();

diff --cc src/sqlite.h.in
Simple merge