Mercurial > evolve
view docs/tutorial/compile.sh @ 3850:340cf6fbe9e9
evolve: create resolved cset on successors of current parents
While resolving content-divergence, sometimes, the parent can be obsolete and
have a successor. We should consider the successors of the parents instead of
obsolete parents as that will do something like orphan+content-divergence
resolution both at the same time which is powerful and results in a single stack
while resolving content-divergence of stacks.
The test changes demonstrates that we can now successfully evolve a content
divergent stack.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 14 Jun 2018 01:39:33 +0530 |
parents | aad37ffd7d58 |
children |
line wrap: on
line source
#!/bin/bash set -eox pipefail function compile { pandoc \ -s $1 \ -o $2 \ --toc --toc-depth=4 \ -F pandocfilters/examples/graphviz.py -F mypandocfilters/graphviz-file.py -F mypandocfilters/raw-file.py \ -t html5 \ --template standalone.html --variable=template_css:uikit.css } compile slides.md index.html