evolve: commit the transaction if conflicts occur while merging content-div Yes, let's commit the transaction in case conflicts occur. Yes, this is what unshelve does and this is one of the reasons we don't like unshelve. Previous patches added support for resolving content-divergence when they are on different parents with parent of one being the gca. In such cases, we relocate one of the divergent commit to the parent of another one. All the relocation stuff and merging divergent changeset stuff happens in a single transaction, so if there are conflicts while merging, we abort and the transaction rollsback and our relocated commit is not applied after abort. We don't want to process the relocation because that can lead to conflicts and we will have dirty wdir because of resolving conflicts. So, we commit the transaction when merging results in conflicts to make sure if relocation happened, we commit that. This fixes the absence of relocation commit found in previous patch and uncover a new bug about handling of relocated commit. Upcoming patch will fix it.

     1

Source: mercurial-evolve

     2

Section: vcs

     3

Priority: optional

     4

Maintainer: Logilab <contact@logilab.fr>

     5

Uploaders:

     6

 Julien Cristau <julien.cristau@logilab.fr>,

     7

 Pierre-Yves David <pierre-yves.david@logilab.fr>,

     8

Standards-Version: 3.9.3

     9

Build-Depends:

    10

 mercurial (>= 4.1),

    11

 python,

    12

 debhelper (>= 8),

    13

 python-sphinx (>= 1.0.8),

    14

 imagemagick,

    15

 librsvg2-bin,

    16

 wget,

    17

Python-Version: >= 2.6

    18

Homepage: https://www.mercurial-scm.org/doc/evolution/

    19

    20

Package: mercurial-evolve

    21

Architecture: all

    22

Depends:

    23

 ${python:Depends},

    24

 ${misc:Depends},

    25

 mercurial (>= 4.1),

    26

Description: evolve extension for Mercurial

    27

 This package provides the experimental "evolve" extension for the Mercurial

    28

 DVCS.

    29

 .

    30

 This extension provides several commands to mutate history and deal with issues

    31

 it may raise.

    32

    33