diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -1652,7 +1652,9 @@ def registersummarycallback(repo, otr, t repo.ui.status(msg) # search new changesets directly pulled as obsolete - obsadded = unfi.revs('%d: and obsolete()', origrepolen) + duplicates = tr.changes.get('revduplicates', ()) + obsadded = unfi.revs('(%d: + %ld) and obsolete()', + origrepolen, duplicates) cl = repo.changelog extinctadded = [r for r in obsadded if r not in cl] if extinctadded: diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -806,6 +806,7 @@ check hgweb does not explode adding file changes added 62 changesets with 63 changes to 9 files (+60 heads) new changesets 50c51b361e60:c15e9edfca13 (62 drafts) + (2 other changesets obsolete on arrival) (run 'hg heads .' to see heads, 'hg merge' to merge) $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; > do