view contrib/merge-test-compat.sh @ 3269:e6b980687311 stable

split: add a test demonstrating that split doesn't take the right branch

Also add a test to check that the dirstate is in the right state in case the
user abort the split.

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