Hi again, While my timeline_showfiles_fix branch was fixing the case where a single commit have it's own changes *and* changes from a merge, it's have a problem when a commit *only* have changes from a merge.
Ironically, the check-in that merge the timeline_showfiles_fix to the trunk show the problem: http://www.fossil-scm.org/index.html/timeline?n=5&v=1&dp=9431fec1ea098fea&unhide= It does not only show file modified by the merge but also other modified files from *previous* check-in on the trunk. Fossil from before the merge show the right thing in that case: it's only show file affected by the current check-in. My change did only remove the: " AND NOT mlink.isaux" condition in the query. But I believe we need to replace this condition by something else a little more complex. Regards -- Martin G. _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
