From: Elijah Newren <newren@gmail.com>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Derrick Stolee" <dstolee@microsoft.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v2 00/10] Complete merge-ort implementation...almost
Date: Wed, 17 Mar 2021 14:42:01 -0700 [thread overview]
Message-ID: <CABPp-BFArfpnirzWZYpX6PnsgLkE+2rcDVjycG6iRWz5Kz0H9g@mail.gmail.com> (raw)
In-Reply-To: <pull.973.v2.git.git.1615271086.gitgitgadget@gmail.com>
On Mon, Mar 8, 2021 at 10:24 PM Elijah Newren via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> This series (nearly) completes the merge-ort implementation, cleaning up
> testsuite failures. The exceptions are some t6423 failures being addressed
> independently[1].
This series was subsumed into
https://lore.kernel.org/git/pull.905.v2.git.1616016485.gitgitgadget@gmail.com/.
So, ignore this topic and look for the changes over there.
(Reasons for the curious: This series had fixed t6409 and t6418 and
the submodule TODO passes, while the other series fixed t6423. The
other series could not have been included when this was submitted
because it depended on the not-yet-submitted ort-perf-batch-10. Why
not just wait? Well Ævar wanted a way to test his changes against
merge-ort, this early submission provided that and helped him find a
bug -- see https://lore.kernel.org/git/20210308150650.18626-1-avarab@gmail.com/.
Now that we can fix all the tests, I'm withdrawing this one and
including it with the other fixes.)
prev parent reply other threads:[~2021-03-17 21:43 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 0:55 [PATCH 00/11] Complete merge-ort implementation...almost Elijah Newren via GitGitGadget
2021-03-05 0:55 ` [PATCH 01/11] merge-ort: use STABLE_QSORT instead of QSORT where required Elijah Newren via GitGitGadget
2021-03-05 0:55 ` [PATCH 02/11] merge-ort: add a special minimal index just for renormalization Elijah Newren via GitGitGadget
2021-03-05 0:55 ` [PATCH 03/11] merge-ort: add a function for initializing our special attr_index Elijah Newren via GitGitGadget
2021-03-08 12:46 ` Ævar Arnfjörð Bjarmason
2021-03-05 0:55 ` [PATCH 04/11] merge-ort: have ll_merge() calls use the attr_index for renormalization Elijah Newren via GitGitGadget
2021-03-08 12:49 ` Ævar Arnfjörð Bjarmason
2021-03-09 4:27 ` Elijah Newren
2021-03-05 0:55 ` [PATCH 05/11] merge-ort: let renormalization change modify/delete into clean delete Elijah Newren via GitGitGadget
2021-03-08 12:55 ` Ævar Arnfjörð Bjarmason
2021-03-05 0:55 ` [PATCH 06/11] merge-ort: support subtree shifting Elijah Newren via GitGitGadget
2021-03-05 0:55 ` [PATCH 07/11] t6428: new test for SKIP_WORKTREE handling and conflicts Elijah Newren via GitGitGadget
2021-03-08 13:03 ` Ævar Arnfjörð Bjarmason
2021-03-08 20:52 ` Elijah Newren
2021-03-05 0:55 ` [PATCH 08/11] merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries Elijah Newren via GitGitGadget
2021-03-08 13:06 ` Ævar Arnfjörð Bjarmason
2021-03-08 20:54 ` Elijah Newren
2021-03-05 0:55 ` [PATCH 09/11] t: mark several submodule merging tests as fixed under merge-ort Elijah Newren via GitGitGadget
2021-03-08 13:07 ` Ævar Arnfjörð Bjarmason
2021-03-05 0:55 ` [PATCH 10/11] merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict Elijah Newren via GitGitGadget
2021-03-08 13:11 ` Ævar Arnfjörð Bjarmason
2021-03-08 21:51 ` Elijah Newren
2021-03-05 0:55 ` [PATCH 11/11] merge-recursive: add a bunch of FIXME comments documenting known bugs Elijah Newren via GitGitGadget
2021-03-08 13:12 ` Ævar Arnfjörð Bjarmason
2021-03-08 14:43 ` [PATCH 00/11] Complete merge-ort implementation...almost Ævar Arnfjörð Bjarmason
2021-03-08 22:13 ` Elijah Newren
2021-03-09 6:24 ` [PATCH v2 00/10] " Elijah Newren via GitGitGadget
2021-03-09 6:24 ` [PATCH v2 01/10] merge-ort: use STABLE_QSORT instead of QSORT where required Elijah Newren via GitGitGadget
2021-03-09 6:24 ` [PATCH v2 02/10] merge-ort: add a special minimal index just for renormalization Elijah Newren via GitGitGadget
2021-03-11 14:48 ` Derrick Stolee
2021-03-09 6:24 ` [PATCH v2 03/10] merge-ort: have ll_merge() use a special attr_index " Elijah Newren via GitGitGadget
2021-03-11 14:52 ` Derrick Stolee
2021-03-09 6:24 ` [PATCH v2 04/10] merge-ort: let renormalization change modify/delete into clean delete Elijah Newren via GitGitGadget
2021-03-09 6:24 ` [PATCH v2 05/10] merge-ort: support subtree shifting Elijah Newren via GitGitGadget
2021-03-09 6:24 ` [PATCH v2 06/10] t6428: new test for SKIP_WORKTREE handling and conflicts Elijah Newren via GitGitGadget
2021-03-11 14:55 ` Derrick Stolee
2021-03-09 6:24 ` [PATCH v2 07/10] merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries Elijah Newren via GitGitGadget
2021-03-09 6:24 ` [PATCH v2 08/10] t: mark several submodule merging tests as fixed under merge-ort Elijah Newren via GitGitGadget
2021-03-11 15:15 ` Derrick Stolee
2021-03-09 6:24 ` [PATCH v2 09/10] merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict Elijah Newren via GitGitGadget
2021-03-09 6:24 ` [PATCH v2 10/10] merge-recursive: add a bunch of FIXME comments documenting known bugs Elijah Newren via GitGitGadget
2021-03-11 15:20 ` [PATCH v2 00/10] Complete merge-ort implementation...almost Derrick Stolee
2021-03-11 16:42 ` Elijah Newren
2021-03-17 21:42 ` Elijah Newren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BFArfpnirzWZYpX6PnsgLkE+2rcDVjycG6iRWz5Kz0H9g@mail.gmail.com \
--to=newren@gmail.com \
--cc=avarab@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).