Fossil

Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

12 check-ins using file src/file.c version 64460aeaaa

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-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