Remove no-op check

This code is only executed when there's two parents.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras
2023-03-13 22:34:34 -06:00
parent e09a14a266
commit 0ae0d20496

View File

@@ -112,7 +112,6 @@ def get_filechanges(repo,revision,parents,files,mleft):
# merges where we really need it due to hg's revlog logic
modified,removed=[],[]
for p in parents:
if p<0: continue
mright=repo[p].manifest()
modified,removed=split_dict(mleft,mright,modified,removed)
modified.sort()