comparison hgext/win32mbcs.py @ 46801:32399d0813e0

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
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Mar 2021 12:08:46 -0700
parents 89a2afe31e82
children 6000f5b25c9b
comparison
equal deleted inserted replaced
46800:186c0f6fbc16 46801:32399d0813e0