Artifact fe6ee8a431b69e5695801bd703fb6a38ce30dc40

Manifest of check-in [fe6ee8a431] - Do not remove files that have been edited when doing an "update". Instead, mark the files as CONFLICT. by drh on 2007-08-08 15:30:04.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

C Do\snot\sremove\sfiles\sthat\shave\sbeen\sedited\swhen\sdoing\san\s"update".\s\sInstead,\nmark\sthe\sfiles\sas\sCONFLICT.
D 2007-08-08T15:30:04
F BUILD.txt e7fed9d5b647337f8e7abf45981d10cdcc1555e2
F COPYRIGHT-GPL2.txt 06877624ea5c77efe3b7e39b0f909eda6e25a4ec
F Makefile 90562f72335594194ed5ccd9e04e0c1d150376be
F src/VERSION 24bbb3aad63325ff33c56d777007d7cd63dc19ea
F src/add.c f62f7b3cc4dfa0516391806d2c1276dd170be809
F src/blob.c 8ec1e279a6cd0cfd5f1e3f8a39f2e9a1682e0113
F src/cgi.c f25a72aeb6ba2d5d8eb1886de143c32d389244ff
F src/checkin.c c7f6520303ed61769c3da10f0a3f71c3d43a95b8
F src/checkout.c 8d2964dd5e804e0a22f5ee2b199f96be25f31d3e
F src/clearsign.c b83f245b62403c327b76020cadae9206a5b98623
F src/clone.c 3302dbc3385e34164e0e51e82e3516db72e2dec9
F src/comformat.c 26c0414fd89346d1d1cfda0762fd8fddbca144b1
F src/config.h b4a2d638880a5ed7a1908c9ad2d4cb99ec758c00
F src/content.c f6a48a05e14150a1d9b87cb16b6b8b1627e06a2b
F src/db.c 98de7574406264c306de91c63fae0810eec67495
F src/delta.c ee93661e27b7758f0592629317a985bfba08c42a
F src/deltacmd.c e730b77c18f05c0c72e8c5d9825a31eae58a0fc2
F src/descendents.c caa863826bbdd0af9f0d98da6937cd113f66f9f0
F src/diff.c 43924b37217e5d2e902869d9bef0a95ea6b143a5
F src/diffcmd.c 42f780093c40738795e34798087ca5685e843674
F src/encode.c 6c31150f725f911658fbc10192a8a7e39bfad10c
F src/file.c 43aa6bdf650be1e986e24eb5ac04f42a1d8d3cb7
F src/http.c 3357e23c4756559fb86f7faa2b45eea9f98dc387
F src/info.c ee42d04161ff45d477cb59de2ee301ce86f0438e
F src/login.c 8638b80caafd500af730721bb83d4faf151cede9
F src/main.c 18f71690c158275e0d28debf4e44a223a6771771
F src/main.mk aa75ff924a836c78ed283e7e7f7955bf6f3f3124
F src/makeheaders.c b7bbc46f28d9e4396b772a389103158e1eff05d3
F src/makeheaders.html 0e4ade7e463ae2bf1595d615a949d2cc14a2a5b4
F src/makemake.tcl 2e4bcdd946763f1ff1c900c23765d290f000d00f
F src/manifest.c 29068b9f318ceeef95a3659bbd3f5a162b6b2574
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 7dcde67735b2bb0808e216b5202169b8160f17e8
F src/sync.c c79d53c017314825e098783a27928fbb31a717c2
F src/timeline.c 01eff9951054d0510409ec502e9f5e6bbe0013c0
F src/translate.c 40ee3ab1003fceddf0e90115c8bb28e040da4550
F src/update.c e7db94fb720978028ed9c176fb4ce3213ba611c8
F src/url.c 6f5bc8946f0938031d783abd1d0f53e2891e0490
F src/user.c 4ebd0dc2823c11dacdcd26b81cebc58f78710473
F src/verify.c 2055907abbb5042924a14decd942b1869b6f5bf3
F src/vfile.c 47b5a77023eb0079cfce7c57ee19e9d519a5822d
F src/wiki.c b7ab86df2b3fb64d82f17c1c0fb8b3b330d3a4d6
F src/wikiformat.c a5de2f9f943fbca121ddfcc5c80c574054b0e348
F src/xfer.c 3a9a49107ff1550b9e54ae4ca533fbdcb5780ff9
F src/zip.c a664fdc0f638cb7d1baaa168bec2ff1950cb9298
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 53b7de51ddd03a95304cfddcf146d681469a6a6c
F www/build.html 0933d4792746d6c9ac262744c60d383336bb1c0e
F www/fileformat.html c1aa3452d9d0200d5e7a11a9140f8082d3cbea0d
F www/index.html 188269ac14ab932a2d64e9fe8af35db4e7da6424
F www/pop.html 13539df59a5a919dda4e5d626f50b5080184ec66
F www/quickstart.html 8e6c0f9e23e650c1e68e1e173191e103be978cdc
F www/selfcheck.html 849df9860df602dc2c55163d658c6b138213122f
P 20bcbcf2f2b2518f1745f473337ce5c524e2a4cf
R c86d144838042ece283aa253e0d7ac0d
U drh
Z 9275330929ac04fa4a3351bbf89e116b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGueGAoxKgR168RlERAmxyAJ9l5WGJgg8AmRhC3JmG/YrIf00KwQCeIvNj
UIJ0/x0ud6xndl1cr7oOKZ4=
=lh6M
-----END PGP SIGNATURE-----