tests/test-filelog.py.out
author Jun Wu <quark@fb.com>
Sun, 27 Aug 2017 02:47:47 -0700
changeset 34008 9422107a6b64
parent 16498 d76ba2090e0c
permissions -rw-r--r--
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

ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
OK.