annotate contrib/merge-test-compat.sh @ 4241:df22f010cf24

next: make next command --evolve by default

Before this patch, if we need to evolve to update to the next child,
we were suggesting the user to use --evolve flag. This patch make some
changes to evolve by default in that conditions.

After making next command to evolve by default we have to consider
the following points:

1) If we don't need to evolve while updating to the next child:

  a) And if wdir is dirty, we suggest to use --merge flag
  b) if wdir is clean, we simply update to next child (if ambiguous,
     prompt the user to select one)

2) If we need to evolve:

  a) when wdir is dirty, we suggest the user to use `hg shelve` first,
     to make wdir clean. As we don't support --merge while evovling.
  b) when wdir is clean, we evolve the next cset.

Changes made in test-prev-next.t reflect the changed behaviour.

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