Artifact 04f7535ee31e45fad8d3bc8f61e313971c5c3d05

Manifest of check-in [04f7535ee3] - The merge at dd9633a03d did not work because of the bug just fixed. This change moves the changes that should have been in that merge into the main line of the tree. by drh on 2007-08-01 12:20:24.

C The\smerge\sat\s[dd9633a03d]\sdid\snot\swork\sbecause\sof\sthe\sbug\sjust\sfixed.\nThis\schange\smoves\sthe\schanges\sthat\sshould\shave\sbeen\sin\sthat\smerge\sinto\nthe\smain\sline\sof\sthe\stree.
D 2007-08-01T12:20:24
F src/VERSION 24bbb3aad63325ff33c56d777007d7cd63dc19ea
F src/add.c 1a5dfcdbfd24c65fa04da865b2e21486d075e154
F src/blob.c 8ec1e279a6cd0cfd5f1e3f8a39f2e9a1682e0113
F src/cgi.c 0b7697e1bfcb14e4f4bdd9d8457a36fa3cee8c7e
F src/checkin.c 5e2184d9adecffce38d0c9464e00c6b9f2e0d265
F src/checkout.c 6397d9f5461f4f92a7e2bc326772c0ebbbd60546
F src/clone.c 3302dbc3385e34164e0e51e82e3516db72e2dec9
F src/comformat.c 26c0414fd89346d1d1cfda0762fd8fddbca144b1
F src/config.h b4a2d638880a5ed7a1908c9ad2d4cb99ec758c00
F src/content.c f6a48a05e14150a1d9b87cb16b6b8b1627e06a2b
F src/db.c 904ab46ad3621a3df8e6c4226f46b8d85e232cd2
F src/delta.c ee93661e27b7758f0592629317a985bfba08c42a
F src/deltacmd.c e730b77c18f05c0c72e8c5d9825a31eae58a0fc2
F src/descendents.c ba7454a9cf6d6bcbea550ba49b11b7032529c437
F src/diff.c 43924b37217e5d2e902869d9bef0a95ea6b143a5
F src/diffcmd.c 42f780093c40738795e34798087ca5685e843674
F src/encode.c 6c31150f725f911658fbc10192a8a7e39bfad10c
F src/file.c 43aa6bdf650be1e986e24eb5ac04f42a1d8d3cb7
F src/http.c e887c92c4d34a4eba4f464f7c59d965b81a564b2
F src/info.c 1c93e966232c47e1f104f8c8bfd3f48ad0ff00d9
F src/linux-gcc.mk cb88682a83b0318a07f9dde011431170f220d1c8
F src/login.c 8638b80caafd500af730721bb83d4faf151cede9
F src/main.c e3d8b5d0b946863c49425cba2949bb575ec3acde
F src/main.mk 7ee81e67bb96697f1c714f4611baf5f7e3649803
F src/makeheaders.c b7bbc46f28d9e4396b772a389103158e1eff05d3
F src/makeheaders.html 0e4ade7e463ae2bf1595d615a949d2cc14a2a5b4
F src/makemake.tcl 8d4df828c70ac93c32eccf103c9509730bafdd65
F src/manifest.c 3aad9c8de5a92dab411691b9a4b921e8c21c9f35
F src/md5.c 15acdef8fff01aefa815ceaa392ea59185d47f3d
F src/merge.c c88ea8508fbc8d75fe3ed3d0bb9f6339e9157f85
F src/merge3.c 5d18e08162e0656a84213840d2d938a5c6fb3690
F src/mkindex.c a7cfef3b71e4923fb19ddc4d9fa9007fcfe915ad
F src/name.c c08d5131363b500cd7d2f34f28be387b01076f85
F src/pivot.c 2953f62a20e8f8584f272b125b6ee4f1e28a9d90
F src/printf.c 48f1118d8ef597aefabf09ff489f7b3bfa462ffa
F src/rebuild.c 04451053b1d87084e08cd8f83a39611d36dca636
F src/schema.c 39376154b892fdcfe6a8f7a0aa902d07cf439755
F src/setup.c b21a277cb9c7708f4bb15b6348561e2634900d05
F src/sha1.c 2a394ff16cb67dad1e87190be62bc7ccfc244ed9
F src/sqlite3.c aec3efbd92c6447389d2be17b16b0d029011a5e6
F src/sqlite3.h 535f235f65b21ca83ff426b755a49e4ca3624dee
F src/style.c 9a943b5a17ed58556d7836e6c79e69ac840b8cc9
F src/sync.c c79d53c017314825e098783a27928fbb31a717c2
F src/timeline.c ccb6f43a3ad5184aa1536fee704ce5a7f55c0f5c
F src/translate.c 40ee3ab1003fceddf0e90115c8bb28e040da4550
F src/update.c d64d008fb643098ebe4fb27515f3e57bff88c74b
F src/url.c 6f5bc8946f0938031d783abd1d0f53e2891e0490
F src/user.c 47ac33e64aa0213e1e87091f5d293879c7dfc719
F src/verify.c 7995bb74af682e983d2c2183a58dacb38cf93e20
F src/vfile.c d4b9c4a1e579dec58d0420e0bb69795cdb86229c
F src/wiki.c b7ab86df2b3fb64d82f17c1c0fb8b3b330d3a4d6
F src/wikiformat.c a5de2f9f943fbca121ddfcc5c80c574054b0e348
F src/xfer.c 47f26fcdc71fd133d596b68c6d79ce4e9625ec8e
F src/zip.c 8d50d34cbbe5a6d7753ff852377efdd8770b7afd
F test/basic1.test d90e14fae8e50a0f7fde78385f6e9db41c27e86d
F test/delta1.test 08d7071c425e560715a6c8d2916369ec5679fa2e
F test/merge1.test 419c5c1aa7f65358008dca1190900e2f90f48950
F test/merge2.test 9b6f797f40414450c29bca52e89a328a586fef40
F test/tester.tcl 8cd24c134d1f6a87a9d5d0493d6b44be4b66be4b
F todo.txt 20f337ccceebd287d47ac21a8b78c807d5820133
F www/fileformat.html c1aa3452d9d0200d5e7a11a9140f8082d3cbea0d
F www/index.html 30f3834664c0cc86c0a66fe34f648769261fca56
F www/pop.html 13539df59a5a919dda4e5d626f50b5080184ec66
F www/selfcheck.html 849df9860df602dc2c55163d658c6b138213122f
P 5c3e87171a336b076e87377b786fa9a1de711016
R 1964926ad2f2d4f8e21db0967c7014fd
U drh
Z 78b227ba5556d38445c81f8839b96d9d