evolve: write data to evolvestate in case on conflicts in phase-divergence
This patch makes phase-divergence resolution write data to evolvestate instead
of graftstate. The `evolve --continue` handling of phase-divergence is broken
which will be done in upcoming patches.
#!/bin/bash
set -euox pipefail
unset GREP_OPTIONS
NOTOPIC="--config experimental.topic-mode=ignore"
compatbranches=`hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse`
prev='stable'
for branch in $compatbranches; do
hg up $branch
hg merge $prev
hg commit -m "test-compat: merge $prev into $branch"
prev=$branch
done