comparison mercurial/dagparser.py @ 17500:8ac8db8dc346

en-us: labeled
author timeless@mozdev.org
date Fri, 17 Aug 2012 13:58:18 -0700
parents 525fdb738975
children c69f4f7fe01a
comparison
equal deleted inserted replaced
17499:3d6d0aa55966 17500:8ac8db8dc346
54 ... 54 ...
55 ... +3 # 3 nodes in linear run 55 ... +3 # 3 nodes in linear run
56 ... :forkhere # a label for the last of the 3 nodes from above 56 ... :forkhere # a label for the last of the 3 nodes from above
57 ... +5 # 5 more nodes on one branch 57 ... +5 # 5 more nodes on one branch
58 ... :mergethis # label again 58 ... :mergethis # label again
59 ... <forkhere # set default parent to labelled fork node 59 ... <forkhere # set default parent to labeled fork node
60 ... +10 # 10 more nodes on a parallel branch 60 ... +10 # 10 more nodes on a parallel branch
61 ... @stable # following nodes will be annotated as "stable" 61 ... @stable # following nodes will be annotated as "stable"
62 ... +5 # 5 nodes in stable 62 ... +5 # 5 nodes in stable
63 ... !addfile # custom command; could trigger new file in next node 63 ... !addfile # custom command; could trigger new file in next node
64 ... +2 # two more nodes 64 ... +2 # two more nodes
65 ... /mergethis # merge last node with labelled node 65 ... /mergethis # merge last node with labeled node
66 ... +4 # 4 more nodes descending from merge node 66 ... +4 # 4 more nodes descending from merge node
67 ... 67 ...
68 ... """))) 68 ... """)))
69 34 69 34
70 70