Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Treat whitespace at the end of lines as significant during a merge. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk | release |
| Files: | files | file ages | folders |
| SHA1: |
1d93222627a3be27face3d8f3da2068e |
| User & Date: | drh 2011-03-01 19:04:32.458 |
References
|
2011-05-03
| ||
| 13:00 | • New ticket [25c54e544e] Cancelling bgcolor leads to white.. artifact: ef8b191829 user: viriketo | |
|
2011-04-18
| ||
| 10:16 | • New ticket [e613f452fa] On 'Edit checkin', checking Start a new Branch named... can be nameless. artifact: c248076f56 user: viriketo | |
|
2011-04-05
| ||
| 07:31 | • Ticket [5f611295e3] Cannot update to a branch leaf status still Open with 1 other change artifact: 15eb23793d user: viriketo | |
|
2011-03-14
| ||
| 20:23 | • New ticket [398afa58de] rebuild fail. artifact: 67b54ae30a user: anonymous | |
Context
|
2011-03-01
| ||
| 22:07 | Fix merge so that it does not segfault when merging text files that do not end in \n and yet have changes at the very end. Ticket [c43d2d9477c2d59a]. check-in: e2122bd620 user: drh tags: trunk | |
| 19:04 | Treat whitespace at the end of lines as significant during a merge. check-in: 1d93222627 user: drh tags: trunk, release | |
| 17:45 | Fix the content_deltify() routine to always return an integer value. This fixes an error in the previous check-in (the --compress checkin). Also fix a help comment on the test-3-way-merge command. check-in: 60c2feea08 user: drh tags: trunk | |
Changes
Changes to src/merge3.c.
| ︙ | ︙ | |||
166 167 168 169 170 171 172 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is ** an array of integer triples. Within each triple, the first integer ** is the number of lines of text to copy directly from the pivot, ** the second integer is the number of lines of text to omit from the ** pivot, and the third integer is the number of lines of text that are ** inserted. The edit array ends with a triple of 0,0,0. */ | | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 |
** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is
** an array of integer triples. Within each triple, the first integer
** is the number of lines of text to copy directly from the pivot,
** the second integer is the number of lines of text to omit from the
** pivot, and the third integer is the number of lines of text that are
** inserted. The edit array ends with a triple of 0,0,0.
*/
aC1 = text_diff(pPivot, pV1, 0, 0, 0);
aC2 = text_diff(pPivot, pV2, 0, 0, 0);
if( aC1==0 || aC2==0 ){
free(aC1);
free(aC2);
return -1;
}
blob_rewind(pV1); /* Rewind inputs: Needed to reconstruct output */
|
| ︙ | ︙ |