contrib/merge-test-compat.sh
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 11 Jan 2018 18:38:09 +0530
changeset 3394 d1486760fb8d
parent 3133 13a4c35f7a0b
child 5080 6db9e2350948
permissions -rwxr-xr-x
tests: add a test demonstrating we still use graft in conflict markers This patch adds a test which shows that we still use the word graft in the conflict markers. Next patch will start using evolve instead of graft.

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