contrib/merge-test-compat.sh
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 11 Apr 2018 07:23:34 +0200
changeset 3661 61fdd25542a6
parent 3133 13a4c35f7a0b
child 5080 6db9e2350948
permissions -rwxr-xr-x
patch: offer the user a chance to fix the patch if it fails to apply The experience is still not great, but better than purely dropping the changes.

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