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

[flake8]

     2

ignore =

     3

         #closing bracket does not match indentation of opening bracket's line

     4

         E123,

     5

         # closing bracket does not match visual indentation

     6

         E124,

     7

         # visually indented line with same indent as next logical line

     8

         E129,

     9

         # at least two spaces before inline comment

    10

         E261,

    11

         # too many leading '#' for block comment

    12

         E266,

    13

         # expected 2 blank lines, found 0

    14

         E302,

    15

         # expected 2 blank lines after end of function or class

    16

         E305,

    17

         # module level import not at top of file

    18

         E402,

    19

         # line too long (82 > 79 characters)

    20

         E501,

    21

         # do not assign a lambda expression, use a def

    22

         E731,

    23

         # class names should use CapWords convention

    24

         N801,

    25

         # line break occurred before a binary operator

    26

         W503

    27

builtins=xrange, execfile

    28