Re: [PATCH v2 08/10] t: mark several submodule merging tests as fixed under merge-ort
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Mar 11, 2021, 15:15 UTC
- Message-ID
- <9a69a5fe-8f47-e925-1d20-0e13576fd995@gmail.com>
- In-Reply-To
- <fcce88c5ac3d317007fd2435f97a9264810e9a22.1615271086.git.gitgitgadget@gmail.com>
On 3/9/2021 1:24 AM, Elijah Newren via GitGitGadget wrote:
Show 11 quoted lines
> From: Elijah Newren <newren@gmail.com> > > merge-ort handles submodules (and directory/file conflicts in general) > differently than merge-recursive does; it basically puts all the special > handling for different filetypes into one place in the codebase instead > of needing special handling for different filetypes in many different > code paths. This one code path in merge-ort could perhaps use some work > still (there are still test_expect_failure cases in the testsuite), but > it passes all the tests that merge-recursive does as well as 12 > additional ones that merge-recursive fails. Mark those 12 tests as > test_expect_success under merge-ort.
Nice! -Stolee