view contrib/merge-test-compat.sh @ 4595:3a3be1378634

evolve: increment progress *after* a whole merge commit is done

The "re-stabilize" step was using the progress that was supposed to be
for the next revision.

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