Mercurial > hg-stable
changeset 51671:7d9bd50afe3d stable
copytracing: fix a bug in an edge case in metadata.compute_all_files_changes
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Thu, 01 Aug 2024 11:14:58 +0100 |
parents | 955084b4f74f |
children | 99632adff795 |
files | mercurial/metadata.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/metadata.py Thu Aug 01 13:04:38 2024 +0100 +++ b/mercurial/metadata.py Thu Aug 01 11:14:58 2024 +0100 @@ -243,7 +243,7 @@ return _process_linear(p1, ctx) elif p1.rev() == nullrev and p2.rev() != nullrev: # In the wild, one can encounter changeset where p1 is null but p2 is not - return _process_linear(p1, ctx, parent=2) + return _process_linear(p2, ctx, parent=2) elif p1.rev() == p2.rev(): # In the wild, one can encounter such "non-merge" return _process_linear(p1, ctx)