hg-stable: .arcconfig@b8882f5d7cb4 (annotated)

copies-tests: update the analysis of the BD/DB cases After thinking more about it, the current change in output between the two merges is not due to an ambiguity, it is introduce by a bug in merge/commit that record a wrong file history. Fixing the bug should fix the output. In the meantime, we have a wrong behavior. In practice the bug is not in the merge code (who does the right things), but in the commit code (who get confused when recording the new file revision). Differential Revision: https://phab.mercurial-scm.org/D8237

33583 b2c27d84f05c phabricator: include the suggested arc config in the repo Alex Gaynor <agaynor@mozilla.com> parents: diff changeset	1	{
b2c27d84f05c phabricator: include the suggested arc config in the repo Alex Gaynor <agaynor@mozilla.com> parents: diff changeset	2	"conduit_uri": "https://phab.mercurial-scm.org/api",
44128 ff396501e841 phabricator: use .arcconfig for `phabricator.url` if not set locally Matt Harbison <matt_harbison@yahoo.com> parents: 33583 diff changeset	3	"phabricator.uri": "https://phab.mercurial-scm.org/",
33583 b2c27d84f05c phabricator: include the suggested arc config in the repo Alex Gaynor <agaynor@mozilla.com> parents: diff changeset	4	"repository.callsign": "HG",
b2c27d84f05c phabricator: include the suggested arc config in the repo Alex Gaynor <agaynor@mozilla.com> parents: diff changeset	5	"arc.land.onto.default": "@",
b2c27d84f05c phabricator: include the suggested arc config in the repo Alex Gaynor <agaynor@mozilla.com> parents: diff changeset	6	"base": "hg:.^"
b2c27d84f05c phabricator: include the suggested arc config in the repo Alex Gaynor <agaynor@mozilla.com> parents: diff changeset	7	}

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Tue, 03 Mar 2020 09:27:31 +0100
changeset 44472	b8882f5d7cb4
parent 44128	ff396501e841
permissions	-rw-r--r--