On Tue, May 05, 2015 at 08:09:20AM -0400, Richard Hipp wrote: > On 5/5/15, Lluís Batlle i Rossell <vi...@viric.name> wrote: > > Hello, > > > > the 'ci' page of merge commits does not show the Added files, only the > > modified. > > > > One example: > > http://fossil-scm.org/index.html/ci/106c0909e45e798ec04f87fb02204d1ccbfd5381 > > > > I think it should show them; it's a bit confusing, otherwise. > > > > The current behavior is by design, not a bug. The files were not > really 'added' - they were only merged into the branch. If we call > this "added" then it really confuse the file history graph. > > I will take this report as an enhancement request. > > Currently Fossil only understands (1) File already exists and (2) File > was added from nothing. You are wanting a third possibility which is > (3) File added by a merge from another branch. > > Fixing this is probably going to involve a lot of work, a lot of > testing, a schema change, and a "fossil rebuild".
Didn't Martin report that this was working before a commit of January? Was this new design introduced in January? I think it would be really helpful if merges showed added files in the commit, comparing to it's primary parent. Regards, Lluís. -- (Escriu-me xifrat si saps PGP / Write ciphered if you know PGP) PGP key D4831A8A - https://emailselfdefense.fsf.org/ _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
