tests: add more test of --abort flag for content-divergence resolution This patch adds test when we resolve multiple content-divergence changesets at once and resolution fo first content-divergence does not form new commits, resolution of second one leads to conflicts. As the output shows, we are wrongly stripping a changeset here, which should be fixed in next patch.

     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