Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/mercurial/dagparser.py Fri Aug 17 13:58:18 2012 -0700 +++ b/mercurial/dagparser.py Fri Aug 17 13:58:18 2012 -0700 @@ -56,13 +56,13 @@ ... :forkhere # a label for the last of the 3 nodes from above ... +5 # 5 more nodes on one branch ... :mergethis # label again - ... <forkhere # set default parent to labelled fork node + ... <forkhere # set default parent to labeled fork node ... +10 # 10 more nodes on a parallel branch ... @stable # following nodes will be annotated as "stable" ... +5 # 5 nodes in stable ... !addfile # custom command; could trigger new file in next node ... +2 # two more nodes - ... /mergethis # merge last node with labelled node + ... /mergethis # merge last node with labeled node ... +4 # 4 more nodes descending from merge node ... ... """)))