From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Dec 2020, #03; Fri, 18)
Date: Sat, 19 Dec 2020 18:19:50 -0800 [thread overview]
Message-ID: <CABPp-BFoSz40-1mNLrxCgMTccYqLOg6ifX5PeLDutbimF9ysPQ@mail.gmail.com> (raw)
In-Reply-To: <xmqq7dpeqrz4.fsf@gitster.c.googlers.com>
On Fri, Dec 18, 2020 at 9:37 PM Junio C Hamano <gitster@pobox.com> wrote:
> A release candidate 2.30-rc1 has been tagged; there are too many
> topics in flight, sadly many of which haven't been adequately
> reviewed. I think there are a couple of topics left in 'next' that
> are obvious candidates for the final, but it would be lovely if we
> can figure out how to get topics in 'seen' that haven't got enough
> love unstuck.
I'll try to post an RFC on the sparse-checkout handling soon; sorry
it's taken me a while. One question on your labelling for the
merge-ort, stuff, though...
> * en/merge-ort-recursive (2020-12-16) 4 commits
> - merge-ort: implement merge_incore_recursive()
> - merge-ort: make clear_internal_opts() aware of partial clearing
> - merge-ort: copy a few small helper functions from merge-recursive.c
> - commit: move reverse_commit_list() from merge-recursive
> (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
...this comment here is repeated below...
> * en/merge-ort-3 (2020-12-15) 11 commits
> - merge-ort: add implementation of type-changed rename handling
> - merge-ort: add implementation of normal rename handling
> - merge-ort: add implementation of rename collisions
> - merge-ort: add implementation of rename/delete conflicts
> - merge-ort: add implementation of both sides renaming differently
> - merge-ort: add implementation of both sides renaming identically
> - merge-ort: add basic outline for process_renames()
> - merge-ort: implement compare_pairs() and collect_renames()
> - merge-ort: implement detect_regular_renames()
> - merge-ort: add initial outline for basic rename detection
> - merge-ort: add basic data structures for handling renames
> (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive.)
What do you mean when you say these two topics are tangled? They were
written to avoid all contextual conflicts, and to be allowed to merge
in either order, and I just re-verified that they merge cleanly. So
I'm not understanding this comment.
If there are any remaining issues in this series, I'd be happy to fix
them up. I'm not aware of any, and Stollee has reviewed the
series[1]. I was planning on submitting another topic next week,
directory rename detection, that builds on this series.
[1] https://lore.kernel.org/git/6448806f-791b-610a-06de-7be5650334e6@gmail.com/,
note that his comment was on series v2 and I addressed his one
remaining point in v3.
next prev parent reply other threads:[~2020-12-20 2:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 5:34 What's cooking in git.git (Dec 2020, #03; Fri, 18) Junio C Hamano
2020-12-19 6:44 ` Eric Sunshine
2020-12-19 17:13 ` Junio C Hamano
2020-12-19 14:10 ` Felipe Contreras
2020-12-19 17:09 ` Junio C Hamano
2020-12-20 2:19 ` Elijah Newren [this message]
2020-12-20 7:32 ` Junio C Hamano
2020-12-21 17:25 ` Elijah Newren
2020-12-21 17:50 ` Junio C Hamano
2020-12-21 12:40 ` Han-Wen Nienhuys
2020-12-21 18:01 ` Junio C Hamano
2020-12-21 19:55 ` [PATCH] SQUASH??? allow t0031 to run with any default branch name Junio C Hamano
2020-12-21 20:19 ` Felipe Contreras
2020-12-22 10:22 ` Han-Wen Nienhuys
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-BFoSz40-1mNLrxCgMTccYqLOg6ifX5PeLDutbimF9ysPQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).