evolve: abort if deciding resolution parent is ambiguous
While solving content-divergence, it could be hard to decide
which cset should be treated as a resolution parent if there
are multiple successors of divergent cset. i.e split case.
But we are planning to make some update in handling this split
case:
1) consider highest one if all splitted csets are in a single
topological branch
2) still need to decide if 1) doesn't apply
#!/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