evolve: add comptability to read old evolvestate files When a user runs `hg evolve` with old evolve where we used to write evolvestate the old ways i.e. without using cbor, and faces conflicts, the evolve is interrupted. If the user updates evolve before completing the evolve, that can result in traceback as the new evolve cannot read the old evolvestate file. The previous patch added function to read old evolvestate file and this patch uses that when we encounter the above mentioned case.

     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