evolve: don't use exception for local flow control The LocalMergeFailure class was added in 3f91654713dd (obsolete Move merge failure handling into stabilize code, 2012-08-20). I think the "if compat.hasconflict(r)" check was added later. Now that we have that check, we should use that for flow control instead. Note that this means that any unexpected exception from _relocatecommit() will now just raise (and roll back the transaction). I think that's an improvement.

     1

#!/bin/sh

     2

. $TESTDIR/testlib/pythonpath.sh

     3

     4

# This file holds logic that is used in many tests.

     5

# It can be called in a test like this:

     6

#  $ . "$TESTDIR/testlib/topic_setup.sh"

     7

     8

# Enable obsolete markers and enable extensions

     9

cat >> $HGRCPATH << EOF

    10

[experimental]

    11

evolution=createmarkers,exchange

    12

    13

[extensions]

    14

rebase=

    15

topic=

    16

EOF