branch | stable |
changeset 26819 | ba7eeeac9603 |
parent 26603 | 517ffec37dee |
child 26862 | 894f54d84d4a |
--- a/mercurial/discovery.py Tue Oct 20 18:46:00 2015 -0400 +++ b/mercurial/discovery.py Wed Oct 21 16:21:27 2015 -0500 @@ -279,7 +279,7 @@ if bookmarks.validdest(repo, rctx, lctx): bookmarkedheads.add(lctx.node()) else: - if bm in newbookmarks: + if bm in newbookmarks and bm not in remotebookmarks: bookmarkedheads.add(repo[bm].node()) # 3. Check for new heads.