tests/.balto.toml
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 24 Aug 2020 15:20:09 +0530
changeset 45468 09edbff6ae8d
parent 40673 337a38995336
permissions -rw-r--r--
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally If a file is not present on the local side, and it's unchanged between other merge parent and ancestor, we don't use any action, neither we had a if-else branch for that condition. This leads to bid-merge missing that there is a such action possible which can be performed. As test changes demonstrate, we now choose the locally deleted side instead of choosing the remote one consistently. This is also wrong behavior which is resulted because of missing possible action. It will be fixed in next patch. This whole logic is not acurrate as we should prompt user on what to do when this kind of criss-cross merge is in play. Differential Revision: https://phab.mercurial-scm.org/D8940
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
40673
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
# Balto (https://bitbucket.org/lothiraldan/balto/src) is a test orchestrator
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     2
# which is compatible with all test runner that can emit the LITF
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     3
# (https://github.com/lothiraldan/litf) test format.
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     4
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     5
# The plugin for the Mercurial test runner is mercurial-litf
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     6
# (https://pypi.org/project/mercurial-litf/). Make sure to follow the
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     7
# instruction and configuration instructions here:
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     8
# https://bitbucket.org/lothiraldan/mercurial_litf/src/default/
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     9
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    10
# You can launch Balto with `balto /path/to/mercurial/tests/`
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    11
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    12
name = "Mercurial Test Suite"
337a38995336 tests: add Balto configuration file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    13
tool = "mercurial"