Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 events occurring around 47cdbbf2fb82664c.
|
2011-10-16
| ||
| 10:04 | merged/resolved trunk [ee723ed98ddb0a]. check-in: a40ac8fdc4 user: stephan tags: json-multitag-test, json | |
| 09:49 | minor doc clarification. check-in: 398b53e059 user: stephan tags: json-multitag-test, json | |
| 02:07 | Separate sbsdiff block separator meta-rows a little more from regular rows in built-in skin 4. check-in: 7a47abe17f user: jan tags: jan-sbsdiff | |
| 00:14 | Updated styles/skins. Built-in skin 4 can now wrap lines. check-in: 1c40493cb5 user: jan tags: jan-sbsdiff | |
|
2011-10-15
| ||
| 21:25 | Add sbsdiff link to the /info page. check-in: 286f09508c user: jan tags: jan-sbsdiff | |
| 18:45 | Add button to toggle sbsdiff for /vdiff views. Renamed the button in /fdiff. check-in: d1f63cd823 user: jan tags: jan-sbsdiff | |
| 18:05 | Add button to toggle sbsdiff for /fdiff views. check-in: d0988fb5bb user: jan tags: jan-sbsdiff | |
| 17:36 | Vary the number of columns of displayed files in the File List depending on the length of the longest filename in the list. check-in: ee723ed98d user: drh tags: trunk | |
| 17:18 | Update to the Fossil-v-Git matrix. check-in: a52287876c user: drh tags: trunk | |
| 15:42 | Merge the latest trunk changes into the side-by-side diff branch. check-in: 15de70c21f user: drh tags: jan-sbsdiff | |
| 14:33 | Updated comments. Slightly more centralization of sbsdiff table generation. check-in: c5ac4f800e user: jan tags: jan-sbsdiff | |
| 12:49 | Fix bug which disabled patch file generation. check-in: dc27e13460 user: jan tags: jan-sbsdiff | |
| 12:30 | Fix clang static analyzer warnings about deref null pointers and undefined values. There are still lots of dead code warnings, but those are harmless. check-in: 630691456b user: drh tags: trunk | |
| 12:24 | • Edit [ff41d4be8a2a3c3b]: Edit check-in comment. artifact: 0b7a73e3fb user: jan | |
| 12:22 | Make sure sbsdiff lines are escaped properly. Started adding side-by-side diff support to fdiff. check-in: ff41d4be8a user: jan tags: jan-sbsdiff | |
| 12:16 | Mark functions that never return (ex: fossil_panic()) as such so that static analyzers can do a better job of pruning paths. check-in: 86d2b4efc8 user: drh tags: trunk | |
| 10:40 | Update the built-in SQLite and the SQL command-line shell to the latest code from the SQLite trunk: version 3.7.9 alpha. This fixes some warnings that started appearing after upgrading to gcc 4.6.1. check-in: 3dd0c15583 user: drh tags: trunk | |
| 10:20 | • Edit [9e3b6ad052374381]: Edit check-in comment. Cancel tag declined. artifact: 6338eed481 user: drh | |
| 10:19 | • Edit [409f370a6db42088]: Move to branch declined. Edit check-in comment. artifact: 0b4b2b67a0 user: drh | |
| 10:17 | A very simple fix to the annotate memory leak problem. check-in: 9929bab702 user: drh tags: trunk | |
| 00:26 | Code documentation. check-in: 9b7955b5a4 user: jan tags: jan-sbsdiff | |
| 00:10 | The link p in the annotate page was totally bad implemented. As I don't see an easy way to implement it, I take it out. There is only d left. check-in: 4bae75a08e user: viriketo tags: annotate_links | |
| 00:06 | The plink is not needed at all in the annotate query check-in: 40cbb69c4f user: viriketo tags: annotate_links | |
|
2011-10-14
| ||
| 23:38 | Starting a branch to add more information into the annotate web page. I added a link p to the annotation of the version previous to that line change, and a link d to the checkin file diff that introduced the given line. I'd want also the links to bring the users to the concerning line of annotate; we should... check-in: 9e3b6ad052 user: viriketo tags: annotate_links | |
| 22:21 | Added two (local) options to sbsdiff (allow expansion and max columns limit), though they can't be changed in runtime yet. Added some missing error handling. check-in: 47cdbbf2fb user: jan tags: jan-sbsdiff | |
| 22:20 | Making 'fossil merge' also report a conflict for extra files overwritten. Like [60c6197c8a], but for the merge operation. Related to ticket [953031915f]. check-in: bb49278a8a user: viriketo tags: declined | |
| 22:17 | Minor diff view change for the black'n'white skin. check-in: 07714601de user: jan tags: jan-sbsdiff | |
| 22:16 | Reporting the number of merge conflicts at the end of merge, as with update. I think the information is of value to the user. I think that had to be introduced in [070ce24d838a6], from its comment, but that change made the opposite of commented. check-in: e1a7a1d9e2 user: viriketo tags: declined | |
| 20:25 | Making fossil warn about a conflict, if an update operation overwrites an extra file. This should close ticket [953031915f]. check-in: 60c6197c8a user: viriketo tags: declined | |
| 19:53 | Same trouble as [bf480a29a6] but for the merge5 test. check-in: 129605856a user: viriketo tags: declined | |
| 19:46 | Fixing the merge5 test, for it to run when out of a checkout. The same kind of fix as [0a7ab3ccb0]. check-in: e46be99ff4 user: viriketo tags: declined | |
| 19:01 | Fixing the merge_renames test; fossil was using $HOME somehow. I noticed it running the test in an environment without a valid $HOME path (the nix package building). fossil refused to run the 'fossil new' inside the merge_renames test. check-in: bf480a29a6 user: viriketo tags: declined | |
| 16:13 | • Edit [4860d9f23481e46f]: Marked "Closed". Edit check-in comment. artifact: 672a28eae7 user: llbatlle | |
| 16:12 | • Edit [9fe787ec03bd0101]: Marked "Closed". Edit check-in comment. artifact: 7888e12b16 user: llbatlle | |
| 16:12 | Merging the extended_ci_names branch, that introduces more ways of naming checkins in diff and update operations. check-in: 107e605f41 user: viriketo tags: declined | |
| 16:11 | Merging the annotate_noleak changes, about removing an important memory leak in the annotate operation. It also fixes some blob behaviour in blob.c and content.c. Update: Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] check-in: 409f370a6d user: viriketo tags: declined | |
| 15:52 | working on json wiki command Closed-Leaf check-in: 4f9f0e9f03 user: zach tags: json-multitag-test, json | |
| 15:41 | Updated the built-in skins for sbsdiff. check-in: bb76b57aa2 user: jan tags: jan-sbsdiff | |
| 08:05 | • New ticket [61e137bfd7] Incorrect relative paths. artifact: bc89fa878d user: altufaltu | |
| 00:06 | Add /*sort*/ marks to some SQL queries to disable warnings about sorting without an index. check-in: fff43ebb5b user: drh tags: trunk | |
|
2011-10-13
| ||
| 23:48 | Started adding support for showing side-by-side diffs in the web ui. check-in: a6a8e89413 user: jan tags: jan-sbsdiff | |
| 23:47 | Provide an option to enable the /test_env URL for all users. Optionally display cookie values in the /test_env URL. check-in: 4d32db8ef8 user: drh tags: trunk | |
| 17:10 | Added downloadPath property to files in timeline view, leading to /raw/FILENAME?name=uuid. check-in: ea5e58155d user: stephan tags: json-multitag-test, json | |
| 16:45 | merged in trunk [862d7dbf59f55e2d]. check-in: 3025ecb2ae user: stephan tags: json-multitag-test, json | |
| 16:39 | Update the SQLite command-line shell to the latest from the SQLite source tree. check-in: 862d7dbf59 user: drh tags: trunk | |
| 12:56 | Fixing the usage() calls in stash.c, as it duplicated the word stash; it was giving messags like "Usage: fossil stash stash pop". check-in: 399c0ddae4 user: viriketo tags: trunk | |
| 11:46 | • Edit [10e1071461651fe1]: Change user to "ashish". artifact: 5b238ddd1b user: drh | |
| 02:47 | Create new branch named "ashish-ipv6" check-in: 10e1071461 user: ashish tags: ashish-ipv6 | |
|
2011-10-12
| ||
| 17:41 | Adding a more options at naming commits for diff and update commands. I wrote a new function that allows more kind of specifications for a checkin uuid: checkout, parent and pivot:id1:id2. If there was a way to discover the 'parent branch' of the current checkout, there could be a 'parentbranch' naming too. I think this makes the life ea... Closed-Leaf check-in: 9fe787ec03 user: viriketo tags: extended_ci_names | |
| 16:24 | • Ticket [30b28cf351] Merge to the checkout (on update) fails, if with renames status still Open with 2 other changes artifact: fc7230ad61 user: viriketo | |