Mercurial > public > mercurial-scm > hg-stable
diff mercurial/metadata.py @ 51875:454feddab720
brancing: merge stable into default
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 06 Sep 2024 02:12:19 +0200 |
parents | ca7bde5dbafb 7d9bd50afe3d |
children | 607e94e01851 |
line wrap: on
line diff
--- a/mercurial/metadata.py Wed Aug 28 23:25:26 2024 +0200 +++ b/mercurial/metadata.py Fri Sep 06 02:12:19 2024 +0200 @@ -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)