20 descendants of [f8f8baf945]
|
2009-03-22
| ||
| 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: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
| ||
| 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-02-26
| ||
| 01:21:04 | * | [f6790b7c3c] Fix a memory leak that was preventing massive check-ins. (user: drh, tags: trunk) |
|
2009-02-21
| ||
| 18:59:46 | * | [c5f4ec0ed5] Undo inadvertant hacking changes in previous ci (should have been documentation only) (user: bharder, tags: trunk) |
| 18:52:26 | * | [5b29f6f65f] typo fix (user: bharder, tags: trunk) |
| 13:09:40 | * | [6ba52ae761] Documentation tweaks. No changes to code. (user: drh, tags: trunk) |
|
2009-02-13
| ||
| 20:30:30 | * | [bc857ecd92] Doc update for branch and co. (user: kejoki, tags: trunk) |
|
2009-02-11
| ||
| 05:00:02 | * | [a89b436bc9] Make command-alias for 'checkout': co. This command could -not- have been used previously as a shortcut, as it would be ambiguous becuase of 'commit' and 'configuration'. A natural mate for 'ci'. (user: bharder, tags: trunk) |
|
2009-02-09
| ||
| 18:09:03 | * | [f80303ac73] fix option/argument parsing for the case where an option is missing a required argument. (user: bharder, tags: trunk) |
| 04:41:08 | * | [8be6204607] 'fossil' encode tagnames for manifest (for ticket 15f49be6b2b1e) (allows for tags with spaces in name) (user: bharder, tags: trunk) |
|
2009-02-01
| ||
| 12:23:53 | * | [daacc139a5] Always report the content-type charset as utf-8. Ticket cc6557cfc5763fa80bb04eecea7f713b0751efc4 (user: drh, tags: trunk) |
|
2009-01-30
| ||
| 21:18:10 | * | [51868cb12f] Leaf Changed update docs, ** ADDED A _SPECIAL_ (but MUTYPE_BLOCK) wikitag <annotation> to put html comments in wikimarkup (user: kkennell, tags: kkinnell-exp) |
| 02:26:57 | * | [23e96cf795] Fix errors in the mimetype-generator table for documentation files. (user: drh, tags: trunk) |
|
2009-01-29
| ||
| 23:04:47 | * | [24c045f373] Merge Merge in kkinnell's documentation updates. (user: drh, tags: trunk) |
| 19:11:52 | * | [f8f8baf945] Add link to branching page. (user: kejoki, tags: trunk) |