Timeline
Not logged in

22 events 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 d67855cceb: css files served as application/x-fossil-artifact not text/css plus 2 other changes (user: drh)
16:31:19 * Fixed ticket f90265fc83: branches plus 1 other change (user: drh)
16:25:37 * Fixed ticket 98b63bd316: 3-way merge drops line plus 2 other changes (user: drh)
16:24:43 * Fixed ticket 5037536050: Confusing conflict markers plus 2 other changes (user: drh)
16:22:51 * Fixed ticket fe5b460867: Typo in "anonymous" user name on instructions on Edit User page plus 2 other changes (user: drh)

16:21:43 * [5ab6f985b9] Fix a typo in a hard-coded web page. Ticket fe5b460867a187cd32a12e04db62392871c4c38b (user: drh, tags: trunk)

14:12:29 * [83566f2424] More improvements to the 3-way merge algorithm. (user: drh, tags: trunk)
10:43:47 * New ticket fe5b460867 Typo in "anonymous" user name on instructions on Edit User page. (user: anonymous)
2009-03-20
23:26:11 * Ticket 98b63bd316 3-way merge drops line status still Open with 1 other change (user: drh)
... 1 similar event omitted.
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-18
18:30:56 * Ticket 1d18a7c110 Force entry of required fields to create a new ticket. status still Open with 2 other changes (user: anonymous)
... 1 similar event omitted.
2009-03-17
01:03:33 * Ticket 7757af0d54 Store rights and owners status still Open with 1 other change (user: anonymous)