##// END OF EJS Templates
rebase: skip obsolete commits even if they have pruned successors...
rebase: skip obsolete commits even if they have pruned successors Issue 5782 reported that `hg rebase -r <obsolete commit with pruned successor>` failed with an error saying that it would cause divergence. Commit b7e2cf114e85 (rebase: do not consider extincts for divergence detection (issue5782), 2018-02-09) fixed it by letting you rebase the commit. However, that fix seems inconsistent with how we handle `hg rebase -r <pruned commit>`. To me, it should make no difference whether a commit is pruned itself or if it has (only) pruned successors. This patch changes it so we treat these two kinds of commits the same way. I let the message we print remain "note: not rebasing <commit>, it has no successor" even though that last part is not technically correct for commits with pruned successors. I doubt it will confuse users. Differential Revision: https://phab.mercurial-scm.org/D10240
Martin von Zweigbergk -
r47559:32399d08 default
Show More
Name Size Modified Last Commit Author
/ hgext
convert
fastannotate
fsmonitor
git
highlight
hooklib
infinitepush
largefiles
lfs
narrow
remotefilelog
zeroconf
__init__.py Loading ...
absorb.py Loading ...
acl.py Loading ...
amend.py Loading ...
automv.py Loading ...
beautifygraph.py Loading ...
blackbox.py Loading ...
bookflow.py Loading ...
bugzilla.py Loading ...
censor.py Loading ...
children.py Loading ...
churn.py Loading ...
clonebundles.py Loading ...
closehead.py Loading ...
commitextras.py Loading ...
eol.py Loading ...
extdiff.py Loading ...
factotum.py Loading ...
fastexport.py Loading ...
fetch.py Loading ...
fix.py Loading ...
githelp.py Loading ...
gpg.py Loading ...
graphlog.py Loading ...
hgk.py Loading ...
histedit.py Loading ...
journal.py Loading ...
keyword.py Loading ...
logtoprocess.py Loading ...
mq.py Loading ...
notify.py Loading ...
pager.py Loading ...
patchbomb.py Loading ...
phabricator.py Loading ...
purge.py Loading ...
rebase.py Loading ...
record.py Loading ...
releasenotes.py Loading ...
relink.py Loading ...
remotenames.py Loading ...
schemes.py Loading ...
share.py Loading ...
show.py Loading ...
sparse.py Loading ...
split.py Loading ...
sqlitestore.py Loading ...
strip.py Loading ...
transplant.py Loading ...
uncommit.py Loading ...
win32mbcs.py Loading ...
win32text.py Loading ...