evolve: move logic to continue interrupted content-div resolution to new fn
Each of the other type has defined their own function to continue/complete the
interrupted resolution. We take out the logic for content-div resolution too in
a separate function to make the top level function looks clean.
#!/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