evolve: return the new replacement node to be stored in evolvestate While resolving phase-divergence, we can end up obsoleting the phase-divergent commit in favor of the public commit. Before this patch we return the node of public commit to store as a replacement of the phase-divergent commit. The above will not cause any problem till the time we use `hg evolve --abort` on an interrupted evolve which tries to strip the replacement nodes because it thinks that the replacements nodes are the ones which are created during the resolution and are new. Since we will be stripping a public node, `evolve --abort` will error out saying cannot strip public changeset, unable to abort evolve which is bad. We should make sure, replacements should only consist of new nodes formed. If the instablity is resolved by obsoleting in favour of old changeset, we should not store the old changeset in replacements in evolvestate.

     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