view contrib/merge-test-compat.sh @ 5064:c9138c441761

evolve: provide branch argument to overlayworkingctx.tomemctx() This is related to upstream 2ecbc4ec87d8 and fixes test-evolve.t.
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 17 Jan 2020 20:40:24 +0700
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