Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 descendants of 4860d9f23481e46f
|
2013-03-14
| ||
| 14:48 | Merging from trunk to get the annotate fixes. Trivial conflict solved. <strong>Update:</strong> the new branch viric_flavour ([b31afcc2ca]) includes most of these changes in a more recent fossil. ... (Closed-Leaf check-in: f14798e0e3 user: viriketo tags: annotate_links) | |
|
2013-02-15
| ||
| 14:37 | Fixing annotate. It was hanging. ... (check-in: 96c3133576 user: viriketo tags: annotate_links) | |
|
2013-02-12
| ||
| 20:17 | Picking recent trunk fixes on tickets. ... (check-in: 7a8ed6d7df user: viriketo tags: annotate_links) | |
|
2013-02-11
| ||
| 20:36 | Fixed the auto-width diff display. ... (check-in: 1b07b3d9b2 user: viriketo tags: annotate_links) | |
| 19:46 | Making it build; diff doesn't work well, about with calculation, yet. ... (check-in: facd98ce8c user: viriketo tags: annotate_links) | |
| 19:30 | Merging from trunk. I still have merge conflicts since my previous merge. ... (check-in: bdeb633a6c user: viriketo tags: annotate_links) | |
|
2013-01-03
| ||
| 10:31 | Updating from trunk. I've left some merge conflicts to solve (annotate, diff) ... (check-in: b5b8448ece user: viriketo tags: annotate_links) | |
|
2012-10-17
| ||
| 14:05 | Picking the latest fix in trunk ... (check-in: 39a59de8cb user: viriketo tags: annotate_links) | |
|
2012-10-16
| ||
| 12:19 | Updating from trunk. ... (check-in: 3cdf9480dd user: viriketo tags: annotate_links) | |
| 12:18 | Fixing buffer overflows in the width calculation of sbsDiff. ... (check-in: 314a294321 user: viriketo tags: annotate_links) | |
|
2012-10-09
| ||
| 14:19 | Adding mime types for some openoffice documents ... (check-in: 770cf7fc35 user: viriketo tags: annotate_links) | |
| 14:01 | Fixing the vdiff submenus, so they behave as usual (for this branch) ... (check-in: 4cf8c3d348 user: viriketo tags: annotate_links) | |
| 13:53 | Adding back the branch telling at checkin info for vdiff. ... (check-in: e29d3822e9 user: viriketo tags: annotate_links) | |
| 13:48 | Updating from trunk. I solved some merge conflicts: 1) the checkin info in the vdiff page, taking that from trunk, and 2) the vdiff menu options, which I tried to get similar to what I had in the branch. ... (check-in: f4b082d464 user: viriketo tags: annotate_links) | |
|
2012-08-20
| ||
| 13:20 | Fixing the automatic calculation of sbs line length, for the case of TABs and UTF8 sequences. I also set the tab size to 4 spaces. ... (check-in: 36cdc17cc8 user: viriketo tags: annotate_links) | |
|
2012-08-08
| ||
| 13:46 | Updating from trunk. I solved three merge conflicts about hyperlinks. ... (check-in: 08db320464 user: viriketo tags: annotate_links) | |
|
2012-04-22
| ||
| 10:09 | Merging from trunk. I solved some conflicts on the report for merges (cherrypick/...), adding some comments, and adopted the trunk solution to unchanged checkin messages. ... (check-in: 40debe4782 user: viriketo tags: annotate_links) | |
| 09:56 | Fix a comment in my previous commit. ... (check-in: 515e7fa0c8 user: viriketo tags: annotate_links) | |
| 09:50 | I change the branch colour algorithm, for another one I can understand better. No HSV magic; simply few combinations of RGB values based on hash. This algorithm should give either different or equal colours, and not similar colours. This way I think the hash differences are more likely to give different colours. I had the feeling that we were getting too often too similar colours for our branches, but I can't prove that mathematically. ... (check-in: 243d99d128 user: viriketo tags: annotate_links) | |
|
2012-04-05
| ||
| 14:31 | Made 'fossil commit' detect if the editor changed the file. If the editor did not change the file, ask confirmation, as if it was an empty comment. I think svn behaves this way. ... (check-in: d2a733beda user: viriketo tags: annotate_links) | |
| 14:19 | Allowing partial commit for merges not adding a parent to the checkin. ... (check-in: a610b2567f user: viriketo tags: annotate_links) | |
| 14:05 | I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick. ... (check-in: ba402f33b2 user: viriketo tags: annotate_links) | |
|
2012-04-04
| ||
| 16:20 | Updating from trunk to get the latest trunk fixes. ... (check-in: b7f3a32d4e user: viriketo tags: annotate_links) | |
| 16:19 | Fixing a jump on uninitialized data on web sbs diff. Noticed after having seen text file corruption in the web SBS, and traced by valgrind. ... (check-in: 92b2a5c390 user: viriketo tags: annotate_links) | |
|
2012-03-18
| ||
| 19:46 | Fixing an unnecessary heap accumulation. ... (check-in: 801a759589 user: viriketo tags: annotate_links) | |
| 14:53 | Making the side-by-side diffs autocalculate the width, by default. ... (check-in: 16397d8625 user: viriketo tags: annotate_links) | |
| 14:03 | Adding a link to vpatch in vdiff. ... (check-in: e926e0b467 user: viriketo tags: annotate_links) | |
| 13:54 | Add a link for a non-detail view in vdiff. ... (check-in: dc313b1547 user: viriketo tags: annotate_links) | |
|
2012-03-01
| ||
| 22:30 | Merging from trunk. I manually solved the conflict widening the user name on annotate. ... (check-in: f201fbaea3 user: viriketo tags: annotate_links) | |
| 22:28 | Fixing 'patch' on the fdiff page. ... (check-in: 675b49efa3 user: viriketo tags: annotate_links) | |
|
2012-02-18
| ||
| 10:37 | Show the branch of the checkin in the vdiff page. ... (check-in: a50a28bb3f user: viriketo tags: annotate_links) | |
|
2012-02-17
| ||
| 23:16 | Fix on the get_parent_branch_rid - wrong variable. ... (check-in: 75b4676c51 user: viriketo tags: annotate_links) | |
| 22:57 | Adding a vdiff link to the info page, "vdiff to the parent branch". ... (check-in: 9f208c6830 user: viriketo tags: annotate_links) | |
| 22:52 | Adding a kind of symbolic name that returns the last checkin of the parent branch merged into the requested branch. For example, if annotate_links forked from trunk, "pbranch:annotate_links" returns the rid of the last time trunk was merged into annotate_links. ... (check-in: d560953c98 user: viriketo tags: annotate_links) | |
| 21:47 | Removing the 'd' link on the annotate page for lines introduced in a checkin with the parent don't having that file. ... (check-in: 4036b5df51 user: viriketo tags: annotate_links) | |
| 21:36 | Merging what I had at [61523cbe67] over trunk related to href targets. ... (check-in: d5129ae101 user: viriketo tags: annotate_links) | |
| 21:29 | Merging from trunk, to get the branch up to date. ... (check-in: 6b7ddfefbf user: viriketo tags: annotate_links) | |
|
2011-10-20
| ||
| 02:03 | Sorry, wrong branch! started changelog for 1.20 release. ... (Closed-Leaf check-in: a942086390 user: stephan tags: declined) | |
|
2011-10-18
| ||
| 19:49 | Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. ... (check-in: ef5d2176f9 user: viriketo tags: annotate_links) | |
|
2011-10-15
| ||
| 00:10 | The link <strong>p</strong> 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 <strong>d</strong> 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 <strong>p</strong> to the annotation of the version previous to that line change, and a link <strong>d</strong> 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 have something like line numbering and line anchors, like the artifact page. ... (check-in: 9e3b6ad052 user: viriketo tags: annotate_links) | |
| 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: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: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. <b>Update:</b> Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] ... (check-in: 409f370a6d user: viriketo tags: declined) | |
|
2011-09-13
| ||
| 17:18 | The Label list was not properly freed in some cases; looking at the annotate of 'win/Makefile.msc' was triggering the case. ... (Closed-Leaf check-in: 4860d9f234 user: viriketo tags: annotate_noleak) | |