This is an archive of the discontinued Mercurial Phabricator instance.

	):			):
	"""update the information about a file in the dirstate			"""update the information about a file in the dirstate

	This is to be called when the direstates parent changes to keep track			This is to be called when the direstates parent changes to keep track
	of what is the file situation in regards to the working copy and its parent.			of what is the file situation in regards to the working copy and its parent.

	This function must be called within a `dirstate.parentchange` context.			This function must be called within a `dirstate.parentchange` context.

	note: the API is at an early stage and we might need to ajust it			note: the API is at an early stage and we might need to adjust it
	depending of what information ends up being relevant and useful to			depending of what information ends up being relevant and useful to
	other processing.			other processing.
	"""			"""
	if merged and (clean_p1 or clean_p2):			if merged and (clean_p1 or clean_p2):
	msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'			msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
	raise error.ProgrammingError(msg)			raise error.ProgrammingError(msg)

	# note: I do not think we need to double check name clash here since we			# note: I do not think we need to double check name clash here since we

dirstate: fix typo in docstringClosedPublic