This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D9003 merge: store cases when a file is absent post merge in commitinfo
Closed	pulkit	D9029 tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
Closed	pulkit	D8989 commit: force create a new filenode if it was set in mergestate by merge
Closed	pulkit	D8988 merge: store commitinfo if mergetool resolved a dc or cd conflict
Closed	pulkit	D9028 tests: add some debugmergestate calls in `test-merge-criss-cross.t`
Closed	pulkit	D8987 tests: add few debugrevlogindex and a log call to see changes in next test
Closed	pulkit	D9027 merge: check new filenode creation config before disabling optimization
Changes Planned	pulkit	D8982 merge: disable `m2-vs-ma` diff optimization in case of flat manifests
Closed	pulkit	D8981 scmutil: introduce function to check whether repo uses treemanifest or not
Closed	pulkit	D9026 configitems: add a new config option to control new filenode functionality
Closed	pulkit	D9025 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
Closed	pulkit	D9002 mergestate: introduce a new ACTION_KEEP_NEW
Changes Planned	pulkit	D8977 merge: check for dir rename dest before adding ACTION_KEEP
Closed	pulkit	D8986 debugmergestate: sort extras before printing
Closed	pulkit	D8985 commit: fix a wrong argument name in documentation
Closed	pulkit	D8984 commit: pass mergestate into _filecommit() instead of re-reading it
Closed	pulkit	D8983 merge: move initial handling of mergeactions near to later one

Diff 22607


	input:			input:

	fctx: a file context with the content we are trying to commit			fctx: a file context with the content we are trying to commit
	manifest1: manifest of changeset first parent			manifest1: manifest of changeset first parent
	manifest2: manifest of changeset second parent			manifest2: manifest of changeset second parent
	linkrev: revision number of the changeset being created			linkrev: revision number of the changeset being created
	tr: current transation			tr: current transation
	individual: boolean, set to False to skip storing the copy data			includecopymeta: boolean, set to False to skip storing the copy data
	(only used by the Google specific feature of using			(only used by the Google specific feature of using
	changeset extra as copy source of truth).			changeset extra as copy source of truth).

	output: (filenode, touched)			output: (filenode, touched)

	filenode: the filenode that should be used by this changeset			filenode: the filenode that should be used by this changeset
	touched: one of: None (mean untouched), 'added' or 'modified'			touched: one of: None (mean untouched), 'added' or 'modified'
	"""			"""