Great explanation, Richard! Thank you a lot! Part of my confusion was related to me never noticing the 'Full' link at the top.
Best regards, Lluís. On Sat, Mar 02, 2013 at 09:48:01AM -0500, Richard Hipp wrote: > On Sat, Mar 2, 2013 at 9:03 AM, Lluís Batlle i Rossell > <vi...@viric.name>wrote: > > > Hello, > > > > I never understood quite well the 'finfo' page arrows. Is there any > > detailed > > explanation of it, and what the arrows mean? > > > > Consider two graphs of the same file: > > (1) http://www.fossil-scm.org/fossil/finfo?name=src/add.c&fco=1 > (2) http://www.fossil-scm.org/fossil/finfo?fco=0&name=src/add.c > > (1) is the "simplified" graph and (2) is the "full" graph. The simplified > graph (1) is shown by default. > > In the simplified graph, each version of a file is shown exactly once, and > it is shown in the branch where it first appears. The arrows show the > progression of versions. Arrows point from the old version of a file to > its next derived version. In example (1), [4f9777f58961d887] is an edit of > [1560b7c42162a2cb] which is an edit of [c877f19ebec7aa01]. > > Sometimes the arrows jump from one branch to another. This is because a > file can be carried forward, without change, from one branch to another. A > new node only appears in the finfo graph when the file is changed. So, for > example [c877f19ebec7aa01] was originally on trunk. But that version was > carried forward into the invalid-unicode branch when that branch was > started. Later, [c877f19ebec7aa01] was changed into [1560b7c42162a2cb] > inside the invalid-unicode branch. When invalid-unicode was merged into > trunk, the [1560b7c42162a2cb] change was carried forward into trunk when > invalid-unicode was merged, but no new node appears on the finfo graph > because the add.c file was not modified by this merge. Later still, the > add.c file was changed again from [1560b7c42162a2cb] to [c877f19ebec7aa01] > while on trunk. > > The full graph (2) shows every occasion where a particular instance of the > add.c file appears in any check-in and in any branch. You can see that > [1560b7c42162a2cb] first appeared in invalid-unicode, but later also > appeared in other branches ticket-d17d6e5b17, trunk, > convert_before_commit_v2, and improve_commit_warning. Merge arrows are > used to show that these are all exactly the same file, that just happened > to be used in multiple places. > > Key point: The simplified finfo graph shows only the first occurrence of > any particular file version. When a file version first appears in a branch > and is only later merged into trunk, the node for the file appears on a > branch in the finfo graph. > > > > > > I've the feeling that the last file change in "trunk" there appearing, > > does not > > mean it's the last state of the file in last "trunk", and that always > > confused > > me. Can it be? > > > > Regards, > > Lluís. > > _______________________________________________ > > fossil-users mailing list > > fossil-users@lists.fossil-scm.org > > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > > > > > -- > D. Richard Hipp > d...@sqlite.org > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
