On Tue, Oct 06, 2015 at 10:53:59PM -0400, Richard Hipp wrote: > On 10/6/15, Martin Gagnon <eme...@gmail.com> wrote: > > Hi all, > > > > While working on the page_timeline() function to bring the equivalent of > > the recently added "-p path" option of the timeline CLI command. I found > > a different behavior between the verbose mode (aka show files) on both > > timeline implementation. > > Good catch. > > > > > When a check-in have 2 or more ancestors (e.g. previous check-in and a > > merge from another branch): > > - Web page timeline (as info page) show only files affected by > > previous check-in. > > > > Example: > > http://fossil-scm.org/index.html/timeline?n=2&v=1&dp=ba9d3f08a136c474 > > > > > > - CLI timeline command also show files from the merge. > > > > Example (from a fossil checkout): > > > > $ fossil timeline -n 1 -v before ba9d3f08a136c474 > > > > What is the preferred behavior? I think both timeline implementation > > should show the same information. > > My first thought is that the CLI version is correct. But I don't know for > sure. >
Here a proposed fix: http://fossil-scm.org/index.html/vdiff?from=root:timeline_showfiles_fix&to=timeline_showfiles_fix&sbs=1 It seems to work for the case below, but I'm not sure it doesn't break something else. -- Martin G. _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
