contrib/merge-test-compat.sh
author Anton Shestakov <av6@dwimlabs.net>
Fri, 14 Jun 2019 18:26:24 +0800 (2019-06-14)
branchstable
changeset 4690 98f345bb9235
parent 3133 13a4c35f7a0b
child 5080 6db9e2350948
permissions -rwxr-xr-x
pick: actually delete pickstate if --abort is given Makes pick to be, uh, actually aborted.
#!/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