Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 32075:7000196a8178 stable
log: document the characters ---graph uses to draw
The meaning of : vs | was undocumented and non-obvious.
author | Matt DeVore <matvore@google.com> |
---|---|
date | Tue, 18 Apr 2017 14:51:32 -0700 |
parents | 2406dbba49bd |
children | 35a69efbf190 b4e1e30528c7 |
comparison
equal
deleted
inserted
replaced
32074:769c831708c7 | 32075:7000196a8178 |
---|---|
3332 With --graph the revisions are shown as an ASCII art DAG with the most | 3332 With --graph the revisions are shown as an ASCII art DAG with the most |
3333 recent changeset at the top. | 3333 recent changeset at the top. |
3334 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, | 3334 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, |
3335 and '+' represents a fork where the changeset from the lines below is a | 3335 and '+' represents a fork where the changeset from the lines below is a |
3336 parent of the 'o' merge on the same line. | 3336 parent of the 'o' merge on the same line. |
3337 Paths in the DAG are represented with '|', '/' and so forth. ':' in place | |
3338 of a '|' indicates one or more revisions in a path are omitted. | |
3337 | 3339 |
3338 .. note:: | 3340 .. note:: |
3339 | 3341 |
3340 :hg:`log --patch` may generate unexpected diff output for merge | 3342 :hg:`log --patch` may generate unexpected diff output for merge |
3341 changesets, as it will only compare the merge changeset against | 3343 changesets, as it will only compare the merge changeset against |