Patchwork [03,of,11] log: describe graph symbols in the help

login
register
mail settings
Submitter Mads Kiilerich
Date Feb. 20, 2014, 1:43 a.m.
Message ID <ac4cb3f845bcc36e783e.1392860607@localhost.localdomain>
Download mbox | patch
Permalink /patch/3709/
State Accepted
Commit 8982a5397687c76665fc8f8c4a761527b4ae4779
Headers show

Comments

Mads Kiilerich - Feb. 20, 2014, 1:43 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1392245070 -3600
#      Wed Feb 12 23:44:30 2014 +0100
# Node ID ac4cb3f845bcc36e783e557a533c309e3828355c
# Parent  833685c6cbcac58df3aaf311c21f0c6b4223e2fc
log: describe graph symbols in the help

I wondered what 'x' meant and didn't find it described anywhere.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3905,6 +3905,12 @@  def log(ui, repo, *pats, **opts):
     each commit. When the -v/--verbose switch is used, the list of
     changed files and full commit message are shown.
 
+    With --graph the revisions are shown as an ASCII art DAG with the most
+    recent changeset at the top.
+    'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
+    and '+' represents a fork where the changeset from the lines below is a
+    parent of the 'o' merge on the same same line.
+
     .. note::
 
        log -p/--patch may generate unexpected diff output for merge