rewind: make sure merge commits include files from p1 and p2 Otherwise rewinding a merge commit makes it lose all changes. This fix populates `updates` argument of rewriteutil.rewrite() with parent changesets. That argument is normally used for folding multiple changesets, but in this case it's simply used to include files from p1 and p2. Usually, rewrite() works fine using ctx.files(), but that function can return an empty list when ctx is a merge commit.

     1

#require test-repo

     2

     3

  $ checkflake8() {

     4

  >   if ! (which flake8 > /dev/null); then

     5

  >     echo skipped: missing tool: flake8;

     6

  >     exit 80;

     7

  >   fi;

     8

  > };

     9

  $ checkflake8

    10

    11

Copied from Mercurial core (60ee2593a270)

    12

    13

  $ cd "`dirname "$TESTDIR"`"

    14

    15

run flake8 if it exists; if it doesn't, then just skip

    16

    17

  $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \

    18

  > -X hgext3rd/evolve/thirdparty \

    19

  > 2>/dev/null \

    20

  > | xargs -0 flake8