Timeline
Not logged in

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

50 events occurring around 9b1d394a719f00f5.

2012-02-11
00:56 Edit [9555560966be1be8]: Marked "Closed". artifact: c620c8e107 user: mistachkin
00:56 Edit [ff19cc215f4758ef]: Marked "Closed". artifact: 91d80bda6e user: mistachkin
2012-02-10
23:37
Record --backout and --cherrypick merges in the VMERGE table with IDs -2 and -1, respectively. On a --cherrypick merge, make the default check-in comment be the same as the check-in comment for the cherrypicked change. check-in: 9c28bca430 user: drh tags: trunk
23:16
Do not record a full-merge when the --backout option is used. check-in: b6710a0143 user: drh tags: trunk
23:09 Edit [e98d793db260a4a6]: Marked "Closed". artifact: d1879b3bf4 user: drh
23:08 Edit [e98d793db260a4a6]: Move to branch msw-docco. artifact: 61a8936206 user: drh
23:05
Merge in the code that optionally runs a TH1 script after each ticket edit. check-in: a9055964f3 user: drh tags: trunk
23:04
Pull over the changes to the 'building and installing' wiki page from msw-docco. There's some more docco changes pending in that branch which should be pulled by sanctioned developers. Closed-Leaf check-in: e98d793db2 user: martin.weber tags: msw-docco
23:03
Merge in the Mistachkin SSL linking fix. check-in: f0635d4e03 user: drh tags: trunk
23:03
Merge in documentation updates. check-in: 75ea5ac672 user: drh tags: trunk
23:01
Revise workaround for OpenSSL symbol name collision problem. Closed-Leaf check-in: ff19cc215f user: mistachkin tags: sslLinkingFix
22:53
Bump versions of zlib and OpenSSL in the Windows makefiles. Also, rename the pqueue_insert function to avoid a symbol name collision with OpenSSL. check-in: 674bc27891 user: mistachkin tags: sslLinkingFix
18:16 Edit [587dd57fe194af81]: Edit check-in comment. artifact: 58ee44db33 user: martin.weber
18:02
climb up the trunk. From up here, clarify wording of the "building and installing" wiki page: you don't need to log in to get the source code for released versions of fossil, the download page will have a shiny source package for you to fetch. Leaf check-in: 587dd57fe1 user: martin.weber tags: msw-docco
15:26
Attempting to do a better job of merging renames. check-in: f0359882c9 user: drh tags: trunk
14:40 Fixed ticket [67a47646ea]: commit failure after merge plus 2 other changes artifact: 2b53da0429 user: drh
14:31
Detect subsequent edits to a file that was updated by merge. This fixes a problem introduced by check-in [b9227b85cbd78] and reported by ticket [67a47646ea38c7ed]. check-in: a932b74433 user: drh tags: trunk
13:50
A better fix for reporting invalid names in the artifact command. check-in: da94a3b1c5 user: drh tags: trunk
13:13
Report an error if the "artifact" command does not find an artifact. check-in: 4e47bdc4a3 user: drh tags: trunk
05:40 Add attachment "merge-conflict.sh" to ticket [67a47646ea] artifact: 1292fef05f user: leor
05:25 New ticket [67a47646ea] commit failure after merge. artifact: dbd4def99d user: leor
02:08
Minor fix to autosetup so that it works on Solaris when using jimsh0. check-in: ced22eb209 user: drh tags: trunk
2012-02-09
13:55
Experimental changes to the "update" command to have it report when it makes no changes to the repository. Closed-Leaf check-in: be10939bff user: drh tags: experimental
04:48
Add experimental support for running a TH1 script after a ticket is edited or created. Closed-Leaf check-in: 9555560966 user: mistachkin tags: tktChangeScript
2012-02-08
03:04
Update the version number to 1.22 and begin entering change log information for the next release. check-in: 9b1d394a71 user: drh tags: trunk
00:34
Fix issues with the --brief option to the diff command. check-in: fbaa7ca99f user: drh tags: trunk
2012-02-07
20:04
Another minor performance enhancement on sbs diff. check-in: 3e3feb2dda user: drh tags: trunk
18:58
Performance optimization for the alignment calculation on side-by-side diffs. Noticably faster. check-in: 87f867018b user: drh tags: trunk
18:13
Optimize the inner loop of the LCS algorithm for the main diff generator. check-in: 4ab6071145 user: drh tags: trunk
16:20
Update the built-in SQLite and SQL command-line shell to the latest code from the SQLite trunk. check-in: 030035345c user: drh tags: trunk
16:13
Minor tweak to the side-by-side alignment algorithm so that it handles pure white-space lines better. check-in: 312590a9ee user: drh tags: trunk
15:38
Add the --brief option to the "diff" command. check-in: e0565d4351 user: drh tags: trunk
04:15
Add chunk number fragment marks to HTML diff output. check-in: b1530c29ab user: drh tags: trunk
03:57
Convert the similarity measure for side-by-side diff alignment to use LCS instead of edit distance. LCS is faster and gives comparable results. check-in: 469462b69a user: drh tags: trunk
00:23
Allow file: clones that transfer private branches. check-in: 8f85286cff user: drh tags: trunk
00:01
Change back to using minimum edit distance for computing similarity of lines for alignment in side-by-side diff change blocks. check-in: 51bda5e441 user: drh tags: trunk
2012-02-06
18:18
Fix the SSH transport method so that it allows everything, without regard to user permissions. check-in: a928c89cb1 user: drh tags: trunk
17:47
The "smhdr" query parameter on the finfo pages gives a more compact header without the detailed object descriptions. check-in: af30a9ab46 user: drh tags: trunk
16:03
Make the diff colors darker by default. check-in: ea4b7cd68c user: drh tags: trunk
15:21
Merge the diff enhancements from the diff-experimental branch into trunk. check-in: bba7aea8ca user: drh tags: trunk
15:02
Tweak to side-by-side alignment: Be more aggressive about marking lines as changed if they are naturally aligned to begin with. Closed-Leaf check-in: 5d836cbda7 user: drh tags: diff-experimental
14:28
Adjust the alignment similarity cutoff score. check-in: 9713e42356 user: drh tags: diff-experimental
14:22
Improvements to the alignment algorithm for block changes in side-by-side diff. check-in: a484cfc2f2 user: drh tags: diff-experimental
03:38
When a line changes in a side-by-side diff, only highlight the part of line that actually changed. check-in: 357d26bc36 user: drh tags: diff-experimental
01:55
Trying out a greedy algorithm for aligning the two sides of a change with side-by-side diff. This helps in some cases, but we could probably benefit from a better algorithm. check-in: 881b65141b user: drh tags: diff-experimental
2012-02-05
20:22
Add the "diff optimizer" which tries to shift inserts and deletes to align with natural boundaries in the text. The resulting diff is no more or less correct than the original; it just seems more natural to human readers. check-in: 98cf5c33bc user: drh tags: trunk
17:19
Rearrange code and edit comments in diff logic, for clarity of presentation. No functional changes. check-in: 032da543f0 user: drh tags: trunk
11:41
set maintainer email addr to fossil-dev list. check-in: d3e83cdb64 user: stephan tags: trunk
02:49
Fix yet another issue with tables in side-by-side diffs - an off-by-one error this time. check-in: de719b4396 user: drh tags: trunk
02:43
Fix another bug in table handling for side-by-side diffs. check-in: db1365bc3b user: drh tags: trunk