view contrib/merge-test-compat.sh @ 3478:4a1ccae58323

evolvecmd: pass evolvestate object to _solve* functions This patchs adds an argument evolvestate to _solve* functions. This will help us in having one evolvestate object which we can pass around various functions and keep storing what's going on.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 22 Jan 2018 17:44:57 +0530
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