Mercurial > public > mercurial-scm > hg-stable

diff mercurial/obsolete.py @ 52137:c33734fbcd4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Rapha?l Gom?s <rgomes@octobus.net>
date Mon, 28 Oct 2024 11:45:02 +0100
parents 8583d138f436 e68fe567a780
children
line wrap: on
line diff
--- a/mercurial/obsolete.py	Sun Oct 27 17:29:18 2024 -0400
+++ b/mercurial/obsolete.py	Mon Oct 28 11:45:02 2024 +0100
@@ -1053,7 +1053,9 @@
             if prec not in newermap:
                 obsutil.successorssets(repo, prec, cache=newermap)
             newer = [n for n in newermap[prec] if n]
-            if len(newer) > 1:
+            # Strickly speaking, the len(newer) is not needed, but it speeds
+            # things up.
+            if len(newer) > 1 and any(n for n in newer if node not in n):
                 divergent.add(rev)
                 break
             toprocess.update(obsstore.predecessors.get(prec, ()))