hg-stable: tests/README@b9d6ab6cdeb4 (annotated)

configitems: add a new config option to control new filenode functionality This series is adding functionality where we can force create a new filenode for some files on a merge-commit. This is meant to represent an explicit choice made by user and hence distingusing the file in the merged commit with the file in parent by creating a new filenode instead of using the parent one. This introduces a experimental config option under which this functionality will be hidden. A new testcase is added in tests/test-merge-criss-cross.t to test the new functionality while making the option does not break other scenarios. Differential Revision: https://phab.mercurial-scm.org/D9026

332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	1	To run the tests, do:
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	2
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	3	cd tests/
2207 8a2a7f7d9df6 Delete the shell version of run-tests Stephen Darnell <stephen@darnell.plus.com> parents: 1933 diff changeset	4	python run-tests.py
332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	5
26421 4b0fc75f9403 urls: bulk-change primary website URLs Matt Mackall <mpm@selenic.com> parents: 8936 diff changeset	6	See https://mercurial-scm.org/wiki/WritingTests for
3934 d0bbd8ee50c7 Move test suite docs to the wiki Matt Mackall <mpm@selenic.com> parents: 3199 diff changeset	7	more information on writing tests.

author	Pulkit Goyal <7895pulkit@gmail.com>
	Mon, 14 Sep 2020 14:31:23 +0530
changeset 45582	b9d6ab6cdeb4
parent 26421	4b0fc75f9403
permissions	-rw-r--r--