evolve: change in a test which demonstrate divergence resolution can break This patch just add "--any" flag to "hg evolve --content-divergent" in a test and changed output reflect that there is something which is not handled correctly. After looking into code I found that it is because of using a evolvestate value which is not updated i.e evolvestate['divergent'] Next patch will fix this problem.

     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