evolve: remove tmpctx arg from _resolvephasedivergent() Before this patch, in _resolvephasedivergent() function we were passing an optional argument "tmpctx" which was used to store a rebased version of bumped if required. But for sake of simplicity we can achieve the same results even without passing this "tmpctx" into that function. No changes in test files demonstrate that this patch don't break anything.

     1

#require test-repo

     2

     3

  $ checkcm() {

     4

  >   if ! (which check-manifest > /dev/null); then

     5

  >     echo skipped: missing tool: check-manifest;

     6

  >     exit 80;

     7

  >   fi;

     8

  > };

     9

  $ checkcm

    10

  $ cat << EOF >> $HGRCPATH

    11

  > [experimental]

    12

  > evolution=all

    13

  > EOF

    14

    15

Run check manifest:

    16

    17

  $ cd $TESTDIR/..

    18

  $ check-manifest

    19

  lists of files in version control and sdist match