This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D6409 convert: don't include file in "files" list if it's added in p2
	Closed	martinvonz	D6408 convert: demonstrate broken {files} list in merge commits with file flags

Diff 15184


	fname = fctx.path()			fname = fctx.path()
	fparent1 = manifest1.get(fname, nullid)			fparent1 = manifest1.get(fname, nullid)
	fparent2 = manifest2.get(fname, nullid)			fparent2 = manifest2.get(fname, nullid)
	if isinstance(fctx, context.filectx):			if isinstance(fctx, context.filectx):
	node = fctx.filenode()			node = fctx.filenode()
	if node in [fparent1, fparent2]:			if node in [fparent1, fparent2]:
	self.ui.debug('reusing %s filelog entry\n' % fname)			self.ui.debug('reusing %s filelog entry\n' % fname)
	if manifest1.flags(fname) != fctx.flags():			if ((fparent1 != nullid and
				manifest1.flags(fname) != fctx.flags()) or
				(fparent2 != nullid and
				manifest2.flags(fname) != fctx.flags())):
	changelist.append(fname)			changelist.append(fname)
	return node			return node

	flog = self.file(fname)			flog = self.file(fname)
	meta = {}			meta = {}
	cfname = fctx.copysource()			cfname = fctx.copysource()
	if cfname and cfname != fname:			if cfname and cfname != fname:
	# Mark the new revision of this file as a copy of another			# Mark the new revision of this file as a copy of another