tests/.balto.toml
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 07 Feb 2022 22:54:38 -0800
changeset 48760 93d6f0e7ba2f
parent 40673 337a38995336
permissions -rw-r--r--
filemerge: move check for identical sides out of filemerge() `filemerge.filemerge()` returns `None` if no merge was necessary because the two sides were identical. I don't think it should be that function's responsibility to handle that case; we should ideally not even call `filemerge.filemerge()` if the two inputs identical. This patch therefore moves the check out to the caller (`mergestate.py`). The largefiles test changed because we now notice that the two sides made the same change, so we don't consider it a merge. Also note that the new message better matches the line above it in the test output. Differential Revision: https://phab.mercurial-scm.org/D12154
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"