evolve: merge commit messages while resolving content-divergence (issue5877) While resolving content-divergence, there can be divergence in commit messages too which should be resolved. This patch uses the hg's internal merge API's to merge commit messages of divergent changesets with predecessor as the base. In case of conflicts, we fallback to divergent's commit message which should be changed in future. We should pop up the editor with the commit message and the conflict markers and let user fix that. Tests are added for the functionality added.

     1

#!/bin/bash

     2

set -eox pipefail

     3

     4

     5

function compile {

     6

    pandoc \

     7

    -s $1 \

     8

    -o $2 \

     9

    --toc --toc-depth=4 \

    10

    -F pandocfilters/examples/graphviz.py -F mypandocfilters/graphviz-file.py -F mypandocfilters/raw-file.py \

    11

    -t html5 \

    12

    --template standalone.html --variable=template_css:uikit.css

    13

    14

}

    15

    16

compile slides.md index.html