Mercurial > evolve
view contrib/merge-test-compat.sh @ 4019:8a6a2c37c0fa stable
sqlcache: also ignore integrity error
integrity error can happens when multiple client tries to warm similar cache.
Given we leave multiple hole in the cache that can be warmed by anyone, this is
harder to avoid that we would like. We simply catch the error in this case.
Someone will warm the missing entry later.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 27 Aug 2018 00:35:51 +0200 |
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