Mercurial > evolve
view contrib/merge-test-compat.sh @ 4698:b89495215c6e stable
tests: demonstrate prune --pair not moving bookmark correctly
After `mkcommit n2` line the bookmark is on the correct changeset, but when we
prune --pair the two newly created changesets (revs 13 and 14), the bookmark
gets moved to their ancestor (rev 0). Instead, it should've moved to the last
of their successors (rev 12).
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 22 Jun 2019 18:37:21 +0800 |
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