view contrib/merge-test-compat.sh @ 3736:4b8c63d14f18

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/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