Mercurial: CONTRIBUTING@e5e1285b6f6f (annotated)

largefiles: prevent in-memory merge instead of switching to on-disk I enabled in-memory merge by default while testing some changes. I spent quite some time troubleshooting why largefiles was still creating an on-disk mergestate. Then I found out that it ignores the callers `wc` argument to `mergemod._update()` and always uses on-disk merge. This patch changes that so we raise an error if largefiles is used with in-memory merge. That way we'll notice if in-memory merge is used with largefiles instead of silently replacing ignoring the `overlayworkingctx` instance and updating the working copy instead. I felt a little bad that this would break things more for users with both largefiles and in-memory rebase enabled. So I also added a higher-level override to make sure that largefiles disables in-memory rebase. It turns out that that fixes `run-tests.py -k largefiles --extra-config-opt rebase.experimental.inmemory=1`. Differential Revision: https://phab.mercurial-scm.org/D9069

30084 a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	1	Our full contribution guidelines are in our wiki, please see:
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	2
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	3	https://www.mercurial-scm.org/wiki/ContributingChanges
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	4
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	5	If you just want a checklist to follow, you can go straight to
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	6
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	7	https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	8
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	9	If you can't run the entire testsuite for some reason (it can be
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	10	difficult on Windows), please at least run `contrib/check-code.py` on
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	11	any files you've modified and run `python contrib/check-commit` on any
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	12	commits you've made (for example, `python contrib/check-commit
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	13	273ce12ad8f1` will report some style violations on a very old commit).

author	Martin von Zweigbergk <martinvonz@google.com>
	Tue, 22 Sep 2020 23:18:37 -0700
changeset 45545	e5e1285b6f6f
parent 30084	a492610a2fc1
permissions	-rw-r--r--