evolve: handle case when newnode can be None while continuing evolve There can be case when `hg evolve --continue` is run, when working directory is clean and there is nothing to be included in the new commit. Let's make sure we handle such cases correctly and obsolete the node which is evolved with parent of wdir as successor. This is same as what rebase does.

     1

#!/bin/bash

     2

set -euox pipefail

     3

     4

unset GREP_OPTIONS

     5

NOTOPIC="--config experimental.topic-mode=ignore"

     6

     7

compatbranches=`hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse`

     8

prev='stable'

     9

for branch in $compatbranches; do

    10

    hg up $branch

    11

    hg merge $prev

    12

    hg commit -m "test-compat: merge $prev into $branch"

    13

    prev=$branch

    14

done

    15