evolve: create new commit while resolving content-divergence
Before this patch, we used to amend one of the content-divergent changes with
the changes from the merge. Creating a new commit will certain advantages like
letting user enter a commit message, showing user the new merge diff before
commiting the content-divergent resolution and give us more control in the
implementation part.
The reason amend was used initially was just because it was easy. There are some
tests update due to change.
=============================
Training supports
=============================
Contributing
============
The main source for the supports is the `slides.md` but it doesn't contains
all the source.
The `slides.md` file contains several snippets that are replaced by other
files at compilation time.
For example:
.. code:: markdown
~~~raw-file
output/fix-a-bug-base.log
~~~
Will replace this three lines by the content of the file `output/fix-a-bug-
base.log` which is generated when running the .t test file (see below for
instruction how to do that).
.. code:: markdown
~~~graphviz-file
graphs/fix-bug-1.dot
~~~
Will replace this three lines by the svg rendering of the graphviz definition
in the file `graphs/fix-bug-1.dot`. This file is generated when running the .t
test file (see below for instruction how to do that).
Environment preparation
=======================
This training supports needs pandoc to compile.
You'll need a copy of the Mercurial source in order to generate the training
supports.
You will also needs a functioning Python environment with the possibility to
use `pip install` with your current user. In doubt, you can use a `virtualenv
<https://virtualenv.pypa.io/en/stable/>`.
You can then run the `prepare.sh` script that will configure the environment
for you.
Generating the supports
=======================
First, you need to run a .t test file to generate a bunch of files. You can
run the test file with this command:
`python /PATH/TO/MERCURIAL/tests/run-tests.py -l test-training.t`
It should have generated files in at least two directories: `graphs` and
`output`.
Finally, launch the `compile.sh` to generate the `index.html` output file.