evolve: add test to demonstrate issue6203 Current logic of content-divergence resolution contains a bug that if resolution parent is not the parent of any of the two divergent changesets, it could undo some changes. I think a good solution for this is to first relocate the divergent cset to it's obsolete parent's successor if applicable and then perform the content-divergence resolution. Next patch will fix the issue.

     1

#!/bin/sh

     2

set -eu

     3

     4

case $1 in

     5

    default)

     6

        echo default

     7

        ;;

     8

    mercurial-*)

     9

        exp=$(echo "$1" | cut -d- -f2 | sed 's#\.#\\.#g')

    10

        echo 'max(tag("re:^'"$exp"'"))'

    11

        ;;

    12

    *)

    13

        echo stable

    14

        ;;

    15

esac