Mercurial > evolve
view contrib/merge-test-compat.sh @ 3861:bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
To prevent the creations of divergence, we automatically mark the successors set
of the rewinded changeset as obsoleted by the rewind result. A new flag
`--as-divergence` is added to disable this behavior.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 17 Jun 2018 00:15:18 +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