Fossil

Timeline
Login

Timeline

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

9 check-ins tagged with "declined"

2011-10-20
02:03
Sorry, wrong branch! started changelog for 1.20 release. ... (Closed-Leaf check-in: a9420863 user: stephan tags: declined)
2011-10-14
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: bb49278a 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: e1a7a1d9 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: 60c6197c user: viriketo tags: declined)
19:53
Same trouble as [bf480a29a6] but for the merge5 test. ... (check-in: 12960585 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: e46be99f 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: bf480a29 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: 107e605f 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: 409f370a user: viriketo tags: declined)