evolve: handle relocation during divergence resolution producing no changes When resolving divergence and the two divergent commits have different parents, we start by rebasing one of them to have the same parent as the other. That step can result in no changes to commit. When it does, we would crash with a TypeError before this patch. This patch fixes it by instead creating an empty commit in that scenario. The existing code then continues to attempt to merge it, which produces no changes, and no commit is created on top. The other side of the divergence is marked as successor as usual, so orphans from the side that became empty will be evolved to the right place (see test).

     1

#require test-repo

     2

     3

Enable obsolescence to avoid the warning issue when obsmarker are found

     4

     5

  $ cat << EOF >> $HGRCPATH

     6

  > [diff]

     7

  > git = yes

     8

  > [experimental]

     9

  > evolution=all

    10

  > EOF

    11

    12

Go back in the hg repo

    13

    14

  $ cd $TESTDIR/..

    15

    16

  $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do

    17

  >    hg export $node | ${RUNTESTDIR}/../contrib/check-commit > ${TESTTMP}/check-commit.out

    18

  >    if [ $? -ne 0 ]; then

    19

  >        echo "Revision $node does not comply with rules"

    20

  >        echo '------------------------------------------------------'

    21

  >        cat ${TESTTMP}/check-commit.out

    22

  >        echo

    23

  >   fi

    24

  > done