Artifact
078fa69ada39864234a2e0c4f9768025102ec5c7:
Ticket change
[078fa69ada]
- Ticket [b6579b1ec1]
Update with a merge fails on unicode files status still Open with 2 other changes
by
drh
2010-11-24 20:13:01.
0000: 44 20 32 30 31 30 2d 31 31 2d 32 34 54 32 30 3a D 2010-11-24T20:
0010: 31 33 3a 30 31 0a 4a 20 2b 63 6f 6d 6d 65 6e 74 13:01.J +comment
0020: 20 5c 6e 5c 6e 3c 68 72 5c 73 2f 3e 3c 69 3e 64 \n\n<hr\s/><i>d
0030: 72 68 5c 73 61 64 64 65 64 5c 73 6f 6e 5c 73 32 rh\sadded\son\s2
0040: 30 31 30 2d 31 31 2d 32 34 5c 73 32 30 3a 31 33 010-11-24\s20:13
0050: 3a 30 31 3a 3c 2f 69 3e 3c 62 72 5c 73 2f 3e 5c :01:</i><br\s/>\
0060: 6e 55 54 46 38 5c 73 73 68 6f 75 6c 64 5c 73 77 nUTF8\sshould\sw
0070: 6f 72 6b 5c 73 66 69 6e 65 2e 5c 73 5c 73 49 74 ork\sfine.\s\sIt
0080: 5c 73 69 73 5c 73 6f 6e 6c 79 5c 73 55 54 46 31 \sis\sonly\sUTF1
0090: 36 5c 73 74 68 61 74 5c 73 69 73 5c 73 6e 6f 74 6\sthat\sis\snot
00a0: 5c 73 73 75 70 70 6f 72 74 65 64 2e 5c 73 5c 73 \ssupported.\s\s
00b0: 46 6f 73 73 69 6c 5c 73 69 73 5c 72 5c 6e 73 65 Fossil\sis\r\nse
00c0: 65 69 6e 67 5c 73 74 68 65 5c 73 30 78 30 30 5c eing\sthe\s0x00\
00d0: 73 62 79 74 65 73 5c 73 69 6e 5c 73 73 6f 6d 65 sbytes\sin\ssome
00e0: 5c 73 6f 66 5c 73 74 68 65 5c 73 63 68 61 72 61 \sof\sthe\schara
00f0: 63 74 65 72 73 5c 73 61 6e 64 5c 73 74 68 69 6e cters\sand\sthin
0100: 6b 73 5c 73 69 74 5c 73 69 73 5c 73 64 65 61 6c ks\sit\sis\sdeal
0110: 69 6e 67 5c 73 77 69 74 68 5c 72 5c 6e 61 5c 73 ing\swith\r\na\s
0120: 62 69 6e 61 72 79 5c 73 66 69 6c 65 5c 73 72 61 binary\sfile\sra
0130: 74 68 65 72 5c 73 74 68 61 6e 5c 73 61 5c 73 74 ther\sthan\sa\st
0140: 65 78 74 5c 73 66 69 6c 65 2e 5c 72 5c 6e 5c 72 ext\sfile.\r\n\r
0150: 5c 6e 49 5c 73 73 75 70 70 6f 73 65 5c 73 74 68 \nI\ssuppose\sth
0160: 65 5c 73 22 64 69 66 66 22 5c 73 6c 6f 67 69 63 e\s"diff"\slogic
0170: 5c 73 28 77 68 69 63 68 5c 73 69 73 5c 73 65 73 \s(which\sis\ses
0180: 73 65 6e 74 69 61 6c 5c 73 74 6f 5c 73 64 6f 69 sential\sto\sdoi
0190: 6e 67 5c 73 61 5c 73 6d 65 72 67 65 29 5c 73 63 ng\sa\smerge)\sc
01a0: 6f 75 6c 64 5c 72 5c 6e 62 65 5c 73 65 6e 68 61 ould\r\nbe\senha
01b0: 6e 63 65 64 5c 73 74 6f 5c 73 64 65 61 6c 5c 73 nced\sto\sdeal\s
01c0: 77 69 74 68 5c 73 55 54 46 31 36 2e 5c 73 5c 73 with\sUTF16.\s\s
01d0: 57 6f 75 6c 64 5c 73 74 68 65 5c 73 70 6f 73 74 Would\sthe\spost
01e0: 65 72 5c 73 63 61 72 65 5c 73 74 6f 5c 73 73 75 er\scare\sto\ssu
01f0: 67 67 65 73 74 5c 73 61 5c 73 70 61 74 63 68 3f ggest\sa\spatch?
0200: 0a 4a 20 72 65 73 6f 6c 75 74 69 6f 6e 20 4f 70 .J resolution Op
0210: 65 6e 0a 4b 20 62 36 35 37 39 62 31 65 63 31 36 en.K b6579b1ec16
0220: 37 34 31 33 63 62 35 39 61 30 64 38 62 37 38 38 7413cb59a0d8b788
0230: 38 66 32 37 35 34 37 38 66 62 30 63 35 0a 55 20 8f275478fb0c5.U
0240: 64 72 68 0a 5a 20 34 64 37 39 35 62 30 30 36 37 drh.Z 4d795b0067
0250: 38 62 32 39 31 37 66 63 31 36 61 39 66 38 65 38 8b2917fc16a9f8e8
0260: 62 34 34 65 39 36 0a b44e96.