This revision was automatically updated to reflect the committed changes. Closed by commit rHG444ed53f93df: discovery: look up bookmarks only among bookmarks (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3163?vs=7819&id=7857 REVISION DETAIL https://phab.mercurial-scm.org/D3163 AFFECTED FILES mercurial/discovery.py CHANGE DETAILS diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -297,12 +297,12 @@ for bm in localbookmarks: rnode = remotebookmarks.get(bm) if rnode and rnode in repo: - lctx, rctx = repo[bm], repo[rnode] + lctx, rctx = localbookmarks.changectx(bm), repo[rnode] if bookmarks.validdest(repo, rctx, lctx): bookmarkedheads.add(lctx.node()) else: if bm in newbookmarks and bm not in remotebookmarks: - bookmarkedheads.add(repo[bm].node()) + bookmarkedheads.add(localbookmarks[bm]) return bookmarkedheads To: martinvonz, #hg-reviewers, indygreg Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
