rebase: move bookmarks with --keep (issue5682)
This is a regression caused by 3b7cb3d17137. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
Showing
- hgext/rebase.py 21 additions, 23 deletionshgext/rebase.py
- mercurial/scmutil.py 18 additions, 4 deletionsmercurial/scmutil.py
- tests/test-rebase-bookmarks.t 33 additions, 0 deletionstests/test-rebase-bookmarks.t
- tests/test-rebase-emptycommit.t 9 additions, 4 deletionstests/test-rebase-emptycommit.t
Loading
Please register or sign in to comment