contrib/merge-test-compat.sh
author Anton Shestakov <av6@dwimlabs.net>
Thu, 06 Jun 2019 17:37:42 +0800
changeset 4676 b6c819facbe8
parent 3133 13a4c35f7a0b
child 5080 6db9e2350948
permissions -rwxr-xr-x
evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.

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