Mercurial > hg
annotate tests/.balto.toml @ 46811:5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.
From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.
Differential Revision: https://phab.mercurial-scm.org/D10149
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 10 Mar 2021 13:14:32 +0530 |
parents | 337a38995336 |
children |
rev | line source |
---|---|
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" |