This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D9939 diff: suppress `merging foo` output lines when performing a merge diff
Abandoned	durin42	D8572 merge: remove special case for in-memory merge
Closed	durin42	D8504 diff: add experimental support for "merge diffs"
Closed	durin42	D9908 context: add missing manifest invalidation after write in overlayworkingctx

Diff 21615

	updated += 1			updated += 1

	# the ordering is important here -- ms.mergedriver will raise if the merge			# the ordering is important here -- ms.mergedriver will raise if the merge
	# driver has changed, and we want to be able to bypass it when overwrite is			# driver has changed, and we want to be able to bypass it when overwrite is
	# True			# True
	usemergedriver = not overwrite and mergeactions and ms.mergedriver			usemergedriver = not overwrite and mergeactions and ms.mergedriver

	if usemergedriver:			if usemergedriver:
	if wctx.isinmemory():
	raise error.InMemoryMergeConflictsError(
	b"in-memory merge does not support mergedriver"
	)
	ms.commit()			ms.commit()
	proceed = driverpreprocess(repo, ms, wctx, labels=labels)			proceed = driverpreprocess(repo, ms, wctx, labels=labels)
	# the driver might leave some files unresolved			# the driver might leave some files unresolved
	unresolvedf = set(ms.unresolved())			unresolvedf = set(ms.unresolved())
	if not proceed:			if not proceed:
	# XXX setting unresolved to at least 1 is a hack to make sure we			# XXX setting unresolved to at least 1 is a hack to make sure we
	# error out			# error out
	return updateresult(			return updateresult(