Mercurial: .arcconfig@e89b3603d3da (annotated)

tests: demonstrate how continuing rebase after upgrade can result in merge If the user starts a rebase with an hg version before 9c9cfecd4600 (rebase: don't use rebased node as dirstate p2 (BC), 2020-01-10) and then runs into conflicts, they will be dropped out to the shell with the rebased node set as the dirstate's second parent. If they then upgrade to a later hg version, it will respect the dirstate's parents and will create a merge commit even if the user was rebasing a non-merge commit. Differential Revision: https://phab.mercurial-scm.org/D8355

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	Martin von Zweigbergk <martinvonz@google.com>
	Wed, 01 Apr 2020 13:27:28 -0700
changeset 44665	e89b3603d3da
parent 44128	ff396501e841
permissions	-rw-r--r--