view contrib/merge-test-compat.sh @ 4524:f6099a171a9d stable

branching: merge 8.5.0 expected output in stable Upstream stable is now for mercurial 5.0
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 17 Apr 2019 20:54:28 +0200
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