Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
74 check-ins using file src/merge.c version b7d15ae3ad
|
2010-05-16
| ||
| 19:14 | Move what used to be the called the trunk into a separate branch named "gpl". The trunk will be modified to contain only code to which we hold clear title and which is licensed using the 2-clause BSD License. Closed-Leaf check-in: ccc7701cc6 user: drh tags: gpl | |
| 11:18 | Pull the latest trunk changes into clear-title. check-in: 96722b6d01 user: drh tags: clear-title | |
|
2010-05-14
| ||
| 17:02 | On the timeline graph, strive to put the "trunk" to the far left. Closed-Leaf check-in: 4c931047ef user: drh tags: trunk | |
|
2010-05-12
| ||
| 14:08 | fix ticket [fc428d2107d6b810fff67892896137c66abd3484] check-in: b24b2e1bba user: rwilson tags: trunk | |
|
2010-05-09
| ||
| 16:51 | Fix a documentation typo. Ticket [64386b2221309d]. check-in: 11b3f31de9 user: drh tags: trunk | |
| 16:49 | Prevent adding special files _FOSSIL_-journal, .fos, and .fos-journal to the repository. Ticket [97d8f830b7e5e2] check-in: c193d2c2e0 user: drh tags: trunk | |
|
2010-05-02
| ||
| 19:21 | Add support for URLs of the form: artifact?ci=CHECKIN&filename=FILENAME. check-in: 6f9901dd42 user: drh tags: trunk | |
|
2010-04-27
| ||
| 23:55 | Ignore byte-order-marks at the beginning of wiki pages. Ticket [466e4bbdc7c90d5] check-in: 9d6507d25d user: drh tags: trunk | |
| 17:17 | Simplify timeline processing. No longer show branch and merge points since those are now obvious from the graph. check-in: 5568603e57 user: drh tags: trunk | |
| 17:02 | Allow the branch name to be changes in the check-in edit screen for a check-in that is the first check-in of a new branch. check-in: af8a8979c6 user: drh tags: trunk | |
|
2010-04-26
| ||
| 15:36 | allow "class" attributes in wiki html markup, so CSS is more useful check-in: 99c26fccba user: ron tags: trunk | |
|
2010-04-22
| ||
| 15:48 | Infrastructure changes that will allow the client-side sync to be run from a web interface - the status messages now go to CGI output if the sync is run from a web page. This is a partial implementation of the "SyncNow" button. The button itself has not yet been added. check-in: c56af61e5e user: drh tags: trunk | |
| 15:18 | Back out check-in [fc23960258211b5bc]. This will close ticket [a534227710d3e5] but re-open ticket [3b1533a090eebd09d]. check-in: f7ec914037 user: drh tags: trunk | |
| 12:44 | Improved detection of invalid home directories and better error messages when invalid home directories are detected. Ticket [c3971eac71a1bd0] check-in: 822133a763 user: drh tags: trunk | |
| 01:02 | When the "name" parameter for the /artifact webpage (and similar pages) is ambiguous, bring up a page that allows the user to choose between the various options. Ticket [901936cf06df1b9b9a]. check-in: d02115bbf0 user: drh tags: trunk | |
| 00:12 | Remove dead code and fix a comment - issues found while looking for an unrelated problem. check-in: d4125d551e user: drh tags: trunk | |
| 00:00 | Fix incorrect redirects to "/home" when there is an ambiguous name on the artifact webpage. Ticket [901936cf06df1b9b]. Still need to add code that will list all possible answers and let the user choose. check-in: f44a3f70be user: drh tags: trunk | |
|
2010-04-15
| ||
| 23:53 | Update to the latest stable check-in of SQLite, as a beta-test for SQLite. check-in: 7c37b46b12 user: drh tags: trunk | |
| 23:50 | Fill the boxes on the graph with the same background color as the text in the timeline description. check-in: 0e7b85bb92 user: drh tags: trunk | |
|
2010-04-07
| ||
| 20:35 | SQLite bug fix. Change a LIKE to a GLOB so that it can use an index. check-in: 5721bce885 user: drh tags: trunk | |
| 20:02 | Update SQLite to a version that includes automatic index support. When compiled with FOSSIL_DEBUG, issue warnings if any automatic index is ever used. check-in: b84917dbf8 user: drh tags: trunk | |
| 11:53 | Accept single-quotes in addition to double-quotes for HTML attribute quoting. check-in: 852e631f08 user: drh tags: trunk | |
|
2010-04-04
| ||
| 23:20 | Pull in recent graph layout changes. check-in: 0551ff8178 user: drh tags: clear-title | |
| 22:40 | Further refinements to the graph layout for file histories. check-in: 1f607de1db user: drh tags: trunk | |
| 21:47 | For file history graphs, use merge arrows to show when the same file appears in multiple check-ins. check-in: 6ea10c5e99 user: drh tags: trunk | |
| 18:38 | Tweaks to the graph layout algorithm to try to get better graphs for individual file histories. check-in: 1d2608b7f4 user: drh tags: trunk | |
|
2010-04-02
| ||
| 20:09 | Merge all recent trunk changes into the clear-title branch (since we hold clear title on all recent changes.) check-in: 64541535d9 user: drh tags: clear-title | |
| 19:28 | Add additional markups to show inefficient queries when running in TH3_DEBUG mode. check-in: 251fd001a8 user: drh tags: trunk | |
| 19:27 | In file changes histories, show when the file is deleted. check-in: 4bbb437f06 user: drh tags: trunk | |
|
2010-03-31
| ||
| 18:42 | Get chroot jails working correctly when a particular fossil repository is specified on the "http" command. This fixes a problem introduced by the multi-repository feature added by check-in [9cd2c42e79] on [2010-01-31]. check-in: 42ba7b97aa user: drh tags: trunk | |
| 17:14 | Patch SQLite to provide a better error message to sqlite3_log() when it is unable to open a file. check-in: a158c4e75d user: drh tags: trunk | |
| 15:27 | Update the mechanism for reporting SQL that does not use indices. The warnings can be suppressed by comments in the SQL text. check-in: 9f1d490dd6 user: drh tags: trunk | |
| 15:17 | Improvements to the SQLite error logging output format. check-in: b30e35fcd2 user: drh tags: trunk | |
| 14:52 | Cause all SQLite errors to be logged as warnings. check-in: 99fea6cde4 user: drh tags: trunk | |
| 14:35 | When compiled with FOSSIL_DEBUG, print warnings if any SQLite queries fail to use indices. check-in: e95e87c1ed user: drh tags: trunk | |
|
2010-03-30
| ||
| 14:29 | Use artifact IDs, not record IDs, on the "diff" link of check-in change listings. check-in: 61c52dd6aa user: drh tags: trunk | |
| 01:22 | The sync, clone, push, and pull commands process 302 redirects. check-in: 84439e9dc7 user: drh tags: trunk | |
|
2010-03-29
| ||
| 00:07 | Add the capability (disabled by default) to accept REMOTE_USER as an authenticated user. Ticket [49929a3557a] check-in: a5a1ff1b4b user: drh tags: trunk | |
|
2010-03-28
| ||
| 23:20 | In the graph algorithm, try to put branches on rails as close as possible to their parent. check-in: 42bbfe9d64 user: drh tags: trunk | |
|
2010-03-27
| ||
| 12:56 | Update the built-in SQLite to 3.6.23.1 release candidate 1. check-in: 340d3398e6 user: drh tags: trunk | |
|
2010-03-25
| ||
| 13:52 | Added the 'New Ticket' link to the ticket report view check-in: f3df06b09f user: jeremy tags: trunk | |
|
2010-03-24
| ||
| 07:10 | update custom ticket wiki page check-in: 0c305be6c1 user: ron tags: trunk | |
|
2010-03-22
| ||
| 14:17 | If the graph height is greater than 32767, omit the <canvas> object. Also, do not appendChild() the graphics <div> objects until after they have been set to "abolute" positioning, to work around a FF performance issue. Ticket [13536c292b60] check-in: 504dc92ceb user: drh tags: trunk | |
| 13:41 | Do not use <canvas> when the height of the graph is greater than 32767. Ticket [13536c292b60]. check-in: 81751fa51b user: drh tags: trunk | |
| 12:52 | Truncate the graph at 32767 pixels. This allows the top part of the graph to be seen when the graph is large, at least. Ticket [13536c292b]. check-in: 076ecdcc56 user: drh tags: trunk | |
|
2010-03-21
| ||
| 22:42 | Comparison typo. Leaf check-in: 624bc1c662 user: linuxfood tags: ssl_platform_fixes | |
| 22:38 | Fix case when trying to free a non-malloced pointer. check-in: ee59ca74b8 user: linuxfood tags: ssl_platform_fixes | |
| 22:14 | Merge in trunk and local fixes. check-in: 3b06c951cf user: linuxfood tags: ssl_platform_fixes | |
| 22:10 | Create new branch named "ssl_platform_fixes" check-in: 6a21088a78 user: linuxfood tags: ssl_platform_fixes | |
| 21:51 | Avoid the use of rowids in URLs, since they can change on a rebuild. Use SHA1-derived artifact IDs instead. check-in: a4b10f43e2 user: drh tags: trunk | |
| 17:03 | Fix for ticket [45f89e504b4] check-in: 3640618d71 user: drh tags: trunk | |
|
2010-03-18
| ||
| 16:27 | Make sure that "Setup" and "Admin" privileges imply 'Append-Tkt' privilege. check-in: a1b7f8e1a9 user: drh tags: trunk | |
| 14:40 | Merge in all of the latest clear-title changes from the trunk. check-in: 7c2577bd63 user: drh tags: clear-title | |
| 14:28 | Update the script that builds the download page. check-in: d5f6a272e9 user: drh tags: trunk | |
| 14:20 | Fix some compiler warnings on windows. check-in: 73c24ae363 user: drh tags: trunk, release | |
| 14:11 | Fix some permissions problems on wiki pages. Always show "Empty Page" text for wiki pages that contain no text. check-in: f442eb2ae2 user: drh tags: trunk | |
| 13:47 | Some minor performance improvements on timeline. check-in: edea06eec7 user: drh tags: trunk | |
| 13:26 | Merge recent experimental changes (the attachment enhancement and the ability to delete wiki) into the trunk. check-in: f4a25366a7 user: drh tags: trunk | |
| 12:55 | Change the timeline comment when a wiki page is deleted. Remove some "#if 0" sections from the code. Closed-Leaf check-in: 49e6670386 user: drh tags: experimental | |
| 10:39 | Show only non-empty wiki pages in the list of all wiki pages. A rebuild is required after updating in order for this feature to work. check-in: 012d5e4f23 user: drh tags: experimental | |
| 02:11 | Add the ability to delete attachments and fix issues with timelines. check-in: 01c0180b3f user: drh tags: experimental | |
| 01:09 | Show attachment in timelines. check-in: 2978e43005 user: drh tags: experimental | |
|
2010-03-17
| ||
| 23:49 | Show artifact changes in ticket history. check-in: 931f8895c6 user: drh tags: experimental | |
| 23:15 | Basic functionality of attachments is now in place. check-in: dd2d3177b1 user: drh tags: experimental | |
| 19:57 | Added screens for adding and listing attachments. check-in: 1fcfa000b4 user: drh tags: experimental | |
| 01:03 | Fix a bug in timeline introduced by the previous check-in. Improvements to the file timeline. check-in: 6953184210 user: drh tags: trunk | |
| 00:40 | Get the derivation graph working for individual file histories. check-in: c19467d68e user: drh tags: trunk | |
|
2010-03-16
| ||
| 21:33 | Work toward adding support for attachments. Keep this on an experimental branch until it is actually working. check-in: c3d7df650b user: drh tags: experimental | |
| 16:52 | Change the format of the A-card for attachments again. Add the ATTACHMENT table to the repository. Insert attachment information into the ATTACHMENT table when processing attachment artifacts. check-in: 615a52f0ba user: drh tags: trunk | |
| 15:38 | Improved file format documentation. Added information on the attachment artifact. Redefine the A-card (which has not previously been used). Update the Manifest object to store attachment artifacts. check-in: d5a4e41c81 user: drh tags: trunk | |
| 14:27 | Provide more space on the ignore-glob entry in the UI. check-in: ef80cbf52f user: jeremy_c tags: trunk | |
| 14:25 | Added the new ignore-glob setting to the Behavior area of the Admin UI check-in: 557e8389db user: jeremy_c tags: trunk | |
|
2010-03-15
| ||
| 20:54 | Add a new form of ticket timeline that shows only the check-ins associated with the ticket. check-in: dec1364848 user: drh tags: trunk | |
| 18:09 | Add the --binary option to the "merge" command and a new "binary-glob" setting. These identify files that should be treated as binary files and which should not be subjected to a 3-way merge. check-in: d327f12522 user: drh tags: trunk | |