Timeline
Not logged in

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

26 events for the month beginning 2011-10-01 by user viriketo

Following month ↑
2011-10-19
20:28
Bringing back the fixes for the 'make test' from [bf480a29a6], [e46be99ff4], [129605856a], for an eventual merge to trunk. check-in: 5692702d50 user: viriketo tags: maketest_fixes
20:16 Closed ticket [f0f9aff371]: 'annotate' misses changes. plus 2 other changes artifact: 9ff0f33c2a user: viriketo
2011-10-18
21:20
Adding a space I forgot in in the html output. Closed-Leaf check-in: 61523cbe67 user: viriketo tags: targets_setting
20:55
Adding a boolean setting to choose the use of 'targets' in the anchors href. Default enabled. Related to the thread starting at [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06588.html] check-in: d29df2f0a2 user: viriketo tags: targets_setting
20:24 Edit [c7c4279f135b9e7a|c7c4279f13]: Edit check-in comment. artifact: e46feb9fb9 user: viriketo
19:49
Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. check-in: ef5d2176f9 user: viriketo tags: annotate_links
19:45
Should fix ticket [f0f9aff371f2]. Until now, the annotate_cmd was taking the last (or any?) checkin that had the artifact to be annotated, totally unrelated to what version is checked out. I made annotate_cmd respect the checkout, and annotate only from the past until the checked out version. This makes the command slower, but at least does... Closed-Leaf check-in: c7c4279f13 user: viriketo tags: annotatecmd_fix
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... 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-10-13
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
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
16:23 Ticket [74413366fe] Bad behaviour merging with renames status still Open with 1 other change artifact: b45e022d7b user: viriketo
16:23 Ticket [554f44ee74] Interbranch interference with merges and renames status still Open with 1 other change artifact: f7ae336113 user: viriketo
16:20
Fixing the merge_renames test, so it accepts being called out of a repository. The message given by fossil when trying 'info' out of a repository had changed. check-in: 0a7ab3ccb0 user: viriketo tags: trunk
15:21
Making the http ssl code output the verification error, in case of verification failure. I also make the user question state the host the certificate is related to. check-in: 79c31f9b73 user: viriketo tags: trunk
2011-10-03
16:34
Disabling Cache-control: no-store, as it made firefox forget about form field contents on back/forward in history. Resolution achieved by a minimal consensus at [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06314.html|this thread on the mailing list]. check-in: 3fac77d7b0 user: viriketo tags: trunk
Previous month ↓