evolve: store the evolvestate file when encountering conflicts
This patch makes `hg evolve` store the evolvestate file when it encounters merge
conflicts while resolving content-divergence.
#!/bin/bashset-euopipefail# Prepare pandoc filtersif[-dpandocfilters/.git];then(cdpandocfilters&&gitremoteupdate&&gitmerge--ff-only)elsegitclonehttps://github.com/Lothiraldan/pandocfilters.gitfipip2installpandocfilterspip2installpygraphvizpip2installpanflutepip2installhg+https://bitbucket.org/octobus/mercurial_docgraphpip2installhg-evolvemkdir-pgraphsoutputCMD_NOT_FOUND=0check_command(){cmd=$1if!which"$cmd">/dev/null2>&1;thenecho"Error: command '$cmd' not found in \$PATH"echo"Please install '$cmd'"CMD_NOT_FOUND=1elseecho"$cmd command was found"fi}check_commandpandoccheck_commandahaif["$CMD_NOT_FOUND"-ne"0"];thenexit1fi# Prepare directory for repositories generated by the training.t filemkdir-pbase-reposrm-Rfbase-repos/*