22 events by user drh occurring around 2009-03-21 16:21:43.
|
2009-03-22
| ||
| 13:44:43 | * | [d63f87c003] Fix a C89 violation in main.c. (user: drh, tags: trunk) |
| 13:18:10 | * | [92638367d8] Add many new test cases for 3-way merge. No new problems found. (user: drh, tags: trunk) |
| 12:25:59 | * | [3e89b0c526] Fix a bug in error recovery logic in the 3-way merge. Added new comments to the 3-way merge code to hopefully make it easier to understand. (user: drh, tags: trunk) |
|
2009-03-21
| ||
| 19:44:41 | * | [26ab4f7012] Additional 3-way-merge test cases. (user: drh, tags: trunk) |
| 19:18:22 | * | [81122988ba] More improvements to the 3-way merge. Additional test cases added. (user: drh, tags: trunk) |
| 16:35:20 | * |
Closed ticket |
| 16:31:19 | * |
Fixed ticket |
| 16:25:37 | * |
Fixed ticket |
| 16:24:43 | * |
Fixed ticket |
| 16:22:51 | * |
Fixed ticket |
| 16:21:43 | * |
[5ab6f985b9]
Fix a typo in a hard-coded web page.
Ticket |
| 14:12:29 | * | [83566f2424] More improvements to the 3-way merge algorithm. (user: drh, tags: trunk) |
|
2009-03-20
| ||
| 23:26:11 | * |
Ticket |
| 01:26:14 | * | [434830cc00] Turn off the debugging prints that were left on by mistake in the previous check-in. (user: drh, tags: trunk) |
| 01:23:53 | * | [e45d478f0c] Improve merge conflict markings. (user: drh, tags: trunk) |
|
2009-03-13
| ||
| 03:22:58 | * | Ticket 7757af0d54 Store rights and owners status still Open with 2 other changes (user: drh) |
|
2009-02-26
| ||
| 01:21:04 | * | [f6790b7c3c] Fix a memory leak that was preventing massive check-ins. (user: drh, tags: trunk) |
|
2009-02-21
| ||
| 13:09:40 | * | [6ba52ae761] Documentation tweaks. No changes to code. (user: drh, tags: trunk) |
|
2009-02-16
| ||
| 12:55:35 | * | Ticket 5a13dbd275 add and ci/commit are inconsistent wrt "*" handling status still Open with 2 other changes (user: drh) |
|
2009-02-01
| ||
| 12:23:53 | * | [daacc139a5] Always report the content-type charset as utf-8. Ticket cc6557cfc5763fa80bb04eecea7f713b0751efc4 (user: drh, tags: trunk) |