tests/.balto.toml
author Kyle Lippincott <spectral@google.com>
Tue, 07 Sep 2021 11:50:12 -0700
branchstable
changeset 47939 053dd53a0b59
parent 40673 337a38995336
permissions -rw-r--r--
filemerge: be more strict when detecting conflict markers, add `|` markers I received a user complaint about detecting a line that contained 78 `=` followed by `*/` as a conflict marker. We'll never generate that, we generate 7 identical characters and either the end of the line, or a space. Let's be explicit about detecting exactly what we produce to reduce the chances of a false positive. While we're here, add `|||||||` as a detected conflict marker (generated with the `keep-merge3` style conflicts). Differential Revision: https://phab.mercurial-scm.org/D11391
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"