comparison contrib/check-py3-compat.py @ 34008:9422107a6b64

rebase: move working parent and bookmark for obsoleted revs (BC) Previously, obsoleted revs with successors in destination are completely ignored. That caused some inconvenience when working copy is obsoleted. Most commands avoid working copy being obsoleted, but `hg pull` is an exception. This patch makes rebase able to move bookmarks or working parent for those obsoleted revs. It does so by keeping the obsoleted revs in `state` and marking them as "skipped, rebased to desired destination" during run-time. This reverts part of the behavior change of 3b7cb3d17137 and D24. Differential Revision: https://phab.mercurial-scm.org/D527
author Jun Wu <quark@fb.com>
date Sun, 27 Aug 2017 02:47:47 -0700
parents 778dc37ce683
children 01417ca7f2e2
comparison
equal deleted inserted replaced
34007:06b0cc2588de 34008:9422107a6b64