tests/bundles/issue4438-r1.hg
author Jun Wu <quark@fb.com>
Sun, 27 Aug 2017 02:47:47 -0700
changeset 34008 9422107a6b64
parent 23233 c1f370dab456
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
23233
c1f370dab456 discovery: test coverage for issue4438 / 86c35b7ae300 / 73cfaa348650
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
     1
(binary:application/octet-stream)