> Le 20 oct. 2015 à 03:45, Jan Nijtmans <jan.nijtm...@gmail.com> a écrit : > > 2015-10-20 9:16 GMT+02:00 Marcel Graf <graf.m.ml+sbf...@gmail.com>: >> On Sun, Oct 18, 2015 at 10:38 PM, Joe Mistachkin <sql...@mistachkin.com> >> wrote: >>> There seems to be a timeline issue: >>> >>> https://system.data.sqlite.org/index.html/timeline?n=50&y=all&v=1 >>> >>> The [2c6bdf20ea] merge check-in has two entries for each of the modified >>> files. >> >> >> The are also duplicate entries in the Changes-section of the Check-In page >> https://system.data.sqlite.org/index.html/info/2c6bdf20ea066691, even after >> the fix http://fossil-scm.org/index.html/info/22e0427b1048534e to fossil. > > It turns out that the cause of this problem is the following commit: > <http://www.fossil-scm.org/index.html/info/9431fec1ea098fea> > so I backed it out. My local trunk build doesn't show the problem > any more. >
Yes, this checkin was an attempt to fix another case where a single checkin modify files and does a merge in same time. In that case it would not show the files from the merge at all. Obviously, the fix was too simplistic. Here is the discussion in fossil-dev ML where I tried to point out the problem. https://www.mail-archive.com/fossil-dev@mailinglists.sqlite.org/msg00269.html -- Martin G.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
