Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:57:29
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
quoted hunk ↗ jump to hunk
+# f +# / +# a---b---c---g---h +# \ +# d---G---i
...
quoted hunk ↗ jump to hunk
+test_run_rebase () { + result=$1 + shift + test_expect_$result "rebase $* --onto drops patches in onto" " + reset_rebase && + git rebase $* --onto h f i && + test_cmp_rev h HEAD~2 && + test_linear_range 'd i' h..
Isn't this expectation wrong? The upstream of the rebased branch is f, and it does not contain G. Hence, G should be replayed. Since h is the reversal of g, the state at h is the same as at c, and applying G should succeed (it is the same change as g). Therefore, I think the correct expectation is: test_linear_range 'd G i' h..
quoted hunk ↗ jump to hunk
+ " +} +test_run_rebase failure '' +test_run_rebase failure -m +test_run_rebase failure -i +test_run_rebase failure -p
-- Hannes