contrib/merge-test-compat.sh
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 10 Dec 2019 19:58:51 +0100
branchstable
changeset 4997 e989d109ca9c
parent 3133 13a4c35f7a0b
child 5080 6db9e2350948
permissions -rwxr-xr-x
test: add test for content divergence involving a date update In this case, each side update the date.

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