contrib/python3-whitelist
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 14 Jul 2017 14:30:55 -0700
changeset 33678 855a1856466d
parent 33586 b7304e1cc914
child 33838 48f3e87ce650
permissions -rw-r--r--
tests: demonstrate crash when trying to rebase merge without its parents As the test case shows, when "hg rebase -d G -r 'B + D + F'" is run on the following graph, we crash with traceback. It's reasonable to fail because we can not easily produce a correct rebased F. The problem is what diff to apply to either the rebased B or the rebased D. We could potentially produce the result by e.g. applying the (F-D) diff to the rebased B and then applying the reverse (E-D) diff on top, but that could result in merge conflicts in each of those steps, which we don't have a way of dealing with. So for now, let's just add a test case to demonstrate that we crash (i.e. the AssertionError is clearly incorrect since the user can run into it). F /| C E | | B D G \|/ A Differential Revision: https://phab.mercurial-scm.org/D212

test-ancestor.py
test-backwards-remove.t
test-branch-tag-confict.t
test-casecollision.t
test-check-commit.t
test-check-execute.t
test-check-pyflakes.t
test-check-pylint.t
test-check-shbang.t
test-contrib-check-code.t
test-contrib-check-commit.t
test-diff-issue2761.t
test-diff-newlines.t
test-diff-reverse.t
test-diff-subdir.t
test-dirstate-nonnormalset.t
test-doctest.py
test-empty-dir.t
test-excessive-merge.t
test-issue1089.t
test-issue1993.t
test-issue842.t
test-locate.t
test-lrucachedict.py
test-manifest.py
test-merge-default.t
test-merge2.t
test-merge5.t
test-revlog-packentry.t
test-run-tests.py
test-unified-test.t
test-update-reverse.t
test-xdg.t