Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/.balto.toml
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 14 Jan 2022 08:17:13 -0800
changeset 48755 6ae3c97a0919
parent 40673 337a38995336
permissions -rw-r--r--
simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148
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"














mercurial