Mercurial > evolve
changeset 5591:18fa4797b5dd
evolvecmd: delete bookmark-handling code obsolete since move away from rebase
We haven't relied on `rebase.rebasenode()` since 58370c718183 (evolve:
use `merge.graft` instead of `rebasenode`, 2014-12-13), so we don't
need to compensate for it.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 24 Sep 2020 16:15:58 -0700 |
| parents | 582e3be0a277 |
| children | 95949b06bd48 |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 0 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Thu Sep 24 15:33:01 2020 -0700 +++ b/hgext3rd/evolve/evolvecmd.py Thu Sep 24 16:15:58 2020 -0700 @@ -956,7 +956,6 @@ date=orig.date(), extra=extra) def _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate): - destbookmarks = repo.nodebookmarks(dest.node()) nodesrc = orig.node() oldbookmarks = repo.nodebookmarks(nodesrc) bmchanges = [] @@ -976,8 +975,6 @@ for book in oldbookmarks: evolvestate[b'bookmarkchanges'].append((book, nodesrc)) bmchanges.append((book, dest.node())) - for book in destbookmarks: # restore bookmark that rebase move - bmchanges.append((book, dest.node())) if bmchanges: repo._bookmarks.applychanges(repo, tr, bmchanges)