C. Scott Ananian venit, vidit, dixit 19.12.2008 01:47: > On Fri, Dec 12, 2008 at 1:28 PM, David Howells <dhowells@xxxxxxxxxx> wrote: >> Add a guide to using GIT's simpler features. >> diff --git a/Documentation/git-haters-guide.txt b/Documentation/git-haters-guide.txt >> +In the above example, I've assumed that you've got your own tree with the head >> +at commit C3, and that you've got a branch that you want to merge, which has >> +its head at commit B3. After merging them, you'd end up with a directed, >> +cyclic tree: > > That should be, "acyclic". There are no cycles, because the graph is directed. Well, directed graphs can have cycles. But the revision graph of a revision control system has to be an acyclic directed graph. Otherwise parenthood would be a complicated matter ;) And no, trees by definition don't have cycles. Also, a "tree" in git lingo is not the graph theoretic notion (which David uses, though incorrectly); this only adds unnecessary points of confusion. For whatever reason the graphs in version control systems are called "dag"s, i.e. directed acyclic graphs, even though "acyclicity" depends on whether you look at the directed or undirected graphs. (Branching then merging gives an undirected cycle.) I guess one may read "directed" as an attribute to "acyclic" here, i.e. ((directed acyclic) graph) rather than (directed (acyclic graph)); so to say "directedly acyclic graph". Or it's just that "dag" reads much better than "adg"... So, please: Simplification yes, but not if it's unnecessarily misleading or even plain wrong (referring to the original proposal, not the comment). Cheers, Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
