evolve: orphans that evolve into nothing don't need successors (issue5967) When continuing to solve an orphan that created no changes (i.e. clean wdir), _completeorphan() used to create an obsmarker that said that the result of that orphan evolution is the currently checked out changeset. That's not a correct obsmarker, because all of the orphan's changes were dropped and so it had no effect on the currently checked out changeset. This is an issue that has only existed when --continu'ing evolve, that's why the fix touches _completeorphan(), but not _solveunstable(). This fix is adapted from a similar "if node is None" block in _finalizerelocate().

     1

# setup config and various utility to test new heads checks on push

     2

     3

. $TESTDIR/testlib/common.sh

     4

     5

cat >> $HGRCPATH <<EOF

     6

[ui]

     7

# simpler log output

     8

logtemplate ="{node|short} ({phase}): {desc}\n"

     9

    10

[phases]

    11

# non publishing server

    12

publish=False

    13

    14

[extensions]

    15

# we need to strip some changeset for some test cases

    16

strip=

    17

evolve=

    18

EOF

    19

    20

setuprepos() {

    21

    echo creating basic server and client repo

    22

    hg init server

    23

    cd server

    24

    mkcommit root

    25

    hg phase --public .

    26

    mkcommit A0

    27

    cd ..

    28

    hg clone server client

    29

}