view contrib/merge-test-compat.sh @ 4760:7e034d44bd4b

py3: also catch ImportError when relative import fails

Python 3 apparently raises an ImportError where Python 2 raised a
ValueError.

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