# HG changeset patch # User Jun Wu # Date 1504054153 25200 # Node ID 06b0cc2588de71d5dbac13148bb83e30288d060a # Parent 32528419db646040efe674232355dac6b80e27b0 rebase: remove an unnecessary adjustdest in clearrebased `rev` being "skipped" could currently be caused by moving `rev` does not create a new commit. In this case, `state[rev]` is already changed to `p1`, and is a sane destination for bookmark or working parent movement. Therefore an additional destination adjustment is unnecessary. Differential Revision: https://phab.mercurial-scm.org/D565 diff -r 32528419db64 -r 06b0cc2588de hgext/rebase.py --- a/hgext/rebase.py Mon Aug 21 20:22:07 2017 -0700 +++ b/hgext/rebase.py Tue Aug 29 17:49:13 2017 -0700 @@ -1497,7 +1497,7 @@ # Move bookmark of skipped nodes to destination. This cannot be handled # by scmutil.cleanupnodes since it will treat rev as removed (no successor) # and move bookmark backwards. - bmchanges = [(name, tonode(max(adjustdest(repo, rev, destmap, state)))) + bmchanges = [(name, tonode(state[rev])) for rev in skipped for name in repo.nodebookmarks(tonode(rev))] if bmchanges: