evolve: always create commit when resolving divergence When resolving content-divergence, the final commit we create may end up empty (which means that Mercurial won't even create it). We've had code for handling that in evolve ever since 41bf6c27a122 (evolve: stabilize now handle conflicting changeset, 2012-08-23). However, that resolved the issue by marking on the divergent commits as successor. As Pierre-Yves has pointed out (in other code reviews), we should instead be creating a new successor. So that's what this patch does. It does that by setting `ui.allowemptycommit` while creating the final commit. However, that is not enough, because we may end up creating the same nodeid as already existed (we'd then end up trying to mark the "new" commit a successor of itself). To solve that, we add some salt to the commit extras. That salt affects lots of tests.

     1

include CHANGELOG

     2

include COPYING

     3

include hgext3rd/topic/README

     4

include MANIFEST.in

     5

include README

     6

include setup.py

     7

recursive-include tests *.py *.sh *.t

     8

     9

include docs/makefile

    10

include docs/*.py

    11

include docs/README

    12

include docs/*.rst

    13

include docs/static/*.svg

    14

include docs/tutorials/*.t

    15

include docs/tutorial/standalone.html

    16

recursive-include docs/figures *.svg *.png

    17

recursive-include docs/tutorial *.css *.js *.md *.py *.rst *.sh *.t

    18

    19

exclude docs/tutorial/.netlify

    20

exclude .gitlab-ci.yml

    21

exclude ./hgext3rd/evolve/legacy.py

    22

exclude .hg-format-source

    23

exclude Makefile

    24

exclude tests/test-drop.t

    25

exclude tests/test-inhibit.t

    26

exclude tests/test-oldconvert.t

    27

    28

prune contrib

    29

prune debian

    30

prune .gitlab

    31

prune hgext3rd/evolve/hack