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

This software was downloaded from

     2

https://www.mercurial-scm.org/repo/evolve/

     3

     4

Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>

     5

               Logilab SA        <contact@logilab.fr>

     6

               Pierre-Yves David <pierre-yves.david@ens-lyon.org>

     7

	       Patrick Mezard <patrick@mezard.eu>

     8

     9

    10

This software may be used and distributed according to the terms of the GNU

    11

General Public License version 2 or any later version.

    12

    13

On Debian systems, the complete text of the GNU General Public License version

    14

2 can be found in `/usr/share/common-licenses/GPL-2'.

    15