Update documentation on how to merge in new SQLite versions. No code change.

Update documentation on how to merge in new SQLite versions. No code change.
BUG=none
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=26986

[Scott Hess - ex-Googler, 2009-09-22 17:33:46]

http://codereview.chromium.org/209058/diff/1/2
File third_party/sqlite/README.chromium (right):

http://codereview.chromium.org/209058/diff/1/2#newcode5
Line 5: # Determine the versions of the release you want and the release we
currently
Suggest you reference http://www.sqlite.org/changes.html here.

http://codereview.chromium.org/209058/diff/1/2#newcode55
Line 55: 
I assume these are standard patch files ... perhaps include the patch
command-lines necessary to apply them, in case someone without much Unix
background gets to do this.

Also, I assume that these all apply after google_generate_preprocessed.sh?

http://codereview.chromium.org/209058/diff/1/3
File third_party/sqlite/misc.patch (right):

http://codereview.chromium.org/209058/diff/1/3#newcode795
Line 795: Index: src/os_symbian.cc
Why are all of these files in here?  They seem to already exist in our current
build.  All of them look like things we added, so there's some rational for
having them in a patch, but won't patch break because the files will already be
there?

http://codereview.chromium.org/209058/diff/1/3#newcode1379
Line 1379: Index: src/shell_icu_linux.c
This already exists, too.

http://codereview.chromium.org/209058/diff/1/3#newcode1410
Line 1410: Index: src/shell_icu_win.c
And this.

http://codereview.chromium.org/209058/diff/1/4
File third_party/sqlite/safe-tolower.patch (right):

http://codereview.chromium.org/209058/diff/1/4#newcode76
Line 76: @@ -372,7 +372,7 @@
Double-check if you need this change.  patch should handle it w/o the change.

[Mike Mammarella, 2009-09-22 17:56:05]

http://codereview.chromium.org/209058/diff/1/2
File third_party/sqlite/README.chromium (right):

http://codereview.chromium.org/209058/diff/1/2#newcode5
Line 5: # Determine the versions of the release you want and the release we
currently
On 2009/09/22 17:33:47, shess wrote:
> Suggest you reference http://www.sqlite.org/changes.html here.

Done.

http://codereview.chromium.org/209058/diff/1/2#newcode55
Line 55: 
On 2009/09/22 17:33:47, shess wrote:
> I assume these are standard patch files ... perhaps include the patch
> command-lines necessary to apply them, in case someone without much Unix
> background gets to do this.
> 
> Also, I assume that these all apply after google_generate_preprocessed.sh?

Done. And no, you apply them before running that script - it generates some
other files in the preprocessed directory from the files that just got patched.

http://codereview.chromium.org/209058/diff/1/3
File third_party/sqlite/misc.patch (right):

http://codereview.chromium.org/209058/diff/1/3#newcode795
Line 795: Index: src/os_symbian.cc
These patch files apply to vanilla sqlite (which does not have these files) to
create what is in our tree. So for files we have added, the entire file is in
the patch.

On 2009/09/22 17:33:47, shess wrote:
> Why are all of these files in here?  They seem to already exist in our current
> build.  All of them look like things we added, so there's some rational for
> having them in a patch, but won't patch break because the files will already
> be there?

http://codereview.chromium.org/209058/diff/1/3#newcode1379
Line 1379: Index: src/shell_icu_linux.c
Ditto.

On 2009/09/22 17:33:47, shess wrote:
> This already exists, too.

http://codereview.chromium.org/209058/diff/1/3#newcode1410
Line 1410: Index: src/shell_icu_win.c
Ditto.

On 2009/09/22 17:33:47, shess wrote:
> And this.

http://codereview.chromium.org/209058/diff/1/4
File third_party/sqlite/safe-tolower.patch (right):

http://codereview.chromium.org/209058/diff/1/4#newcode76
Line 76: @@ -372,7 +372,7 @@
Yes, it does, but the patch applies at an offset and creates a .orig file. This
makes the patch apply correctly in the order I listed them in the file. (This is
the only file which is patched by more then one of our patches. I split this
hunk out from the rest and so it needs its offset adjusted to apply cleanly
after the other patch.)

On 2009/09/22 17:33:47, shess wrote:
> Double-check if you need this change.  patch should handle it w/o the change.

[Scott Hess - ex-Googler, 2009-09-23 20:54:30]

LGTM after dropping the indicated section from README.

With the patch command-line, my points about the patch files don't apply.  I was
assuming you were patching w/in third_party/sqlite/

http://codereview.chromium.org/209058/diff/4001/4002
File third_party/sqlite/README.chromium (right):

http://codereview.chromium.org/209058/diff/4001/4002#newcode68
Line 68: The following notes are old but you can get the idea:
I think this section is irrelevant.  Gears lived in perforce, so I was putting
the CVS checkout of SQLite in sqlite_vendor and doing a perforce branch over to
sqlite_google.  This means that we could rely on perforce to do our merging. 
Besides not using perfoce, the above instructions manage the merge by other
means.