Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
40 check-ins using file src/merge.c version 324d1004f2
|
2010-07-14
| ||
| 13:25 | Run without arguments, fossil proposes to run fossil help to list available commands. Closed-Leaf check-in: e0a9b6e044 user: benoit tags: benoit | |
|
2010-06-23
| ||
| 11:58 | Fix to a "help" message. No code changes. check-in: b892572644 user: drh tags: trunk | |
| 11:54 | Do not try to drop system tables when rebuilding a repository. Ticket [7c700d2f28838490]. check-in: b063e40725 user: drh tags: trunk | |
| 11:48 | Merge quickstart.wiki changes into the trunk. check-in: c6cfa4ebc4 user: drh tags: trunk | |
| 11:46 | Back out the benoit branch changes added by the previous check-in. check-in: 17075ffb37 user: drh tags: ttmrichter | |
| 05:27 | Fix makemake.tcl to generate main.mk as committed previously. <i>Moved onto the "benoit" branch because it fails to build.</i> check-in: 953d293c32 user: benoit tags: benoit | |
| 04:33 | Merge from the "benoit" branch. check-in: 84e497e440 user: michael tags: ttmrichter | |
| 02:21 | Merging trunk into private branch. check-in: 54d0648f1d user: michael tags: ttmrichter | |
|
2010-06-22
| ||
| 11:35 | Improve Make system for easier compilation with MinGW awk must still be in PATH and zlib compiled for mingw. check-in: 7b7fe27678 user: BM tags: benoit | |
|
2010-06-21
| ||
| 19:28 | Fix a segfault that can occur if a corrupt delta gets into the archive. check-in: b9a744e1c4 user: drh tags: trunk | |
| 15:08 | Update to the latest version of SQLite with WAL support. check-in: ed1037e225 user: drh tags: trunk | |
| 15:08 | Fix a typo in the "branching.wiki" document. check-in: 83d6065c99 user: drh tags: trunk | |
|
2010-06-18
| ||
| 03:21 | Fixed up the quickstart to present information in a more logical order. check-in: 43472d55f3 user: michael tags: ttmrichter | |
|
2010-06-17
| ||
| 02:01 | Fix an uninitialized variable in the graph generator - error inserted by the previous checkin. check-in: 4d1ef64ee8 user: drh tags: trunk | |
| 01:37 | Update to the latest version of SQLite - one that includes the fix for the corruption bug associated with the file-size in byte 28 of the database header. Also fix a bug in the graph generator, and change an index to help timeline run faster for branch queries. check-in: 5129d32a37 user: drh tags: trunk | |
|
2010-06-16
| ||
| 20:33 | On a branch timeline, in addition to showing the checkins of the branch, also show check-ins of other branches that merge into or from the branch being displayed. This helps to show what has happened to an infrequently changing branch which is part of a much more active project. check-in: 6752934026 user: drh tags: trunk | |
|
2010-06-13
| ||
| 15:58 | Add the ability to escape Wiki page names in hyperlinks using a wiki: prefix. Ticket [f58a05747498d3aaa9ea1e4f8f4015c209dfc54a]. check-in: d6b2c387a0 user: drh tags: trunk | |
|
2010-06-11
| ||
| 12:27 | Fix documentation typos. check-in: b16b4337b9 user: drh tags: trunk | |
| 12:02 | Change the default style to center the title with the project name above and with 200 pixel wide logo and status boxes to the left and right. check-in: 15b293259d user: drh tags: trunk | |
|
2010-06-10
| ||
| 19:21 | The previous two check-ins to the exp-search branch should have been on the trunk. This check-in pulls them over. check-in: d90467ed85 user: drh tags: trunk | |
| 19:19 | Change the title of the home page from "Fossil Home Page" to simply "Home Page". Leaf check-in: 0fd61810c4 user: drh tags: exp-search | |
| 18:50 | Use the qoute() function to encode setting value for the "configure export" command. This allows the binary logo image to be exported. check-in: 59fcfb777d user: drh tags: exp-search | |
|
2010-06-09
| ||
| 12:29 | Updates to the homepage. Fix a minor bug in the check-in edit screen of the web-UI. check-in: 404aaecff8 user: drh tags: trunk | |
|
2010-06-05
| ||
| 20:04 | reintroduce "co" alias for "checkout"; Originally introduced with [a89b436bc9] check-in: 91eded7a09 user: bharder tags: trunk | |
|
2010-05-25
| ||
| 12:30 | Fix typo in the [/doc/tip/www/selfhost.wiki | Self-Hostiry Repositories] page. Ticket [e39122fcc434125c6]. check-in: f19de0b02d user: drh tags: trunk | |
|
2010-05-24
| ||
| 18:43 | Fix a bug in HTML attribute parsing. check-in: cb44f7dea4 user: drh tags: trunk | |
| 18:19 | Rewrite the SRC= attribute of <IMG> markup to insert the zBaseURL where appropriate. check-in: dc82d5709c user: drh tags: trunk | |
| 15:37 | added a check for null document pointers in search_score that corrected search form crash check-in: cad393d597 user: Zeugmal tags: exp-search | |
|
2010-05-22
| ||
| 13:24 | Add the auto-captcha setting back to the command-line setting command. Default auto-captcha to on. check-in: 5fbd593aa7 user: drh tags: trunk | |
| 11:46 | Add the test-move-repository command. check-in: 4a19864419 user: drh tags: trunk | |
| 11:28 | Fix memory leaks associated with the cgi_rfc822_datestamp() function. check-in: 99dcff4d28 user: drh tags: trunk | |
|
2010-05-21
| ||
| 21:05 | adding code, wiki, tickets, checkins search functionality check-in: 73d274360c user: Zach tags: exp-search | |
| 16:21 | Fix issues with attachments on tickets. In the artifact viewer, do a better job of detecting JPEG images from the content prefix. check-in: 3343450e64 user: drh tags: trunk, release | |
| 15:16 | Fix an unterminated string in the information viewer for attachments. check-in: 65d2067247 user: drh tags: trunk | |
|
2010-05-17
| ||
| 18:24 | re-introduce "co" "checkout" command to BSD branch Closed-Leaf check-in: 0072bfefd2 user: bch tags: trunk | |
| 14:29 | Fix typo in copyright assignment form. check-in: 4cb397a7cb user: drh tags: trunk | |
|
2010-05-16
| ||
| 19:38 | Update the "License" link on the homepage to go to the BSD license text rather than GPL license text. check-in: 1a987869e0 user: drh tags: trunk | |
| 19:36 | Merge support for HTTPS back into trunk. (It got lost during the conversion from GPL to BSD.) check-in: 68fa646f49 user: drh tags: trunk | |
| 19:16 | Rename the "clear-title" branch as the new trunk. The trunk is now relicensed using the Simplified BSD License. check-in: bf1c21ba16 user: drh tags: trunk | |
| 19:08 | Change from GPL to the Simplified BSD License. Closed-Leaf check-in: c06edd231f user: drh tags: clear-title | |