Mercurial > hg
view tests/crashgetbundler.py @ 34354:2f427b57bf90 stable 4.3.3
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
author | Jun Wu <quark@fb.com> |
---|---|
date | Mon, 18 Sep 2017 10:54:00 -0700 |
parents | f3807a135e43 |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( changegroup, error, extensions ) def abort(orig, *args, **kwargs): raise error.Abort(_('this is an exercise')) def uisetup(ui): extensions.wrapfunction(changegroup, 'getbundler', abort)