view contrib/merge-test-compat.sh @ 3525:300d7d019b98

compat: drop hack around http request handling for 4.6 The approach we used in 4.5 works again :-)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 14 Mar 2018 02:32:08 +0100
parents 13a4c35f7a0b
children 6db9e2350948
line wrap: on
line source

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