comparison tests/phabricator/phabsend-hash-fixes.json @ 46836:80cac9936324

reabase: call rewriteutil.precheck() a bit later We now filter out descendants of divergence-causing commits in `_handleskippingobsolete()`. The filtered-out commits are removed from the rebase set (`destmap` and `state`). We should therefore call `rewriteutil.precheck()` after `_handleskippingobsolete()`. This patch does that. It hasn't mattered so far because `rewriteutil.precheck()` doesn't yet check for divergence, but it will soon. This affects one test where we now fail because the user is trying to rebase an ancestor instead of failing because they tried to rebase a public commit. We have several similar tests just after, where we still fail because of the phase, so that seems fine. The difference in behavior also seems fine to me. Differential Revision: https://phab.mercurial-scm.org/D10258
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 23 Mar 2021 14:15:40 -0700
parents 1a5d3e555c70
children
comparison
equal deleted inserted replaced
46835:c2438f2f635c 46836:80cac9936324