From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)
Date: Thu, 19 Apr 2018 06:04:28 +0900 [thread overview]
Message-ID: <xmqqzi20grab.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BEKe1u_e=5V471PzoJjdvuYZ2n8H=h7mVa8fOR7XsoytA@mail.gmail.com> (Elijah Newren's message of "Wed, 18 Apr 2018 12:39:17 -0700")
Elijah Newren <newren@gmail.com> writes:
> On Mon, Apr 16, 2018 at 11:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> * en/rename-directory-detection-reboot (2018-04-16) 32 commits
>> ...
>> - directory rename detection: testcases to avoid taking detection too far
>> - directory rename detection: directory splitting testcases
>> - directory rename detection: basic testcases
>>
>> Reboot of an attempt to detect wholesale directory renames and use
>> it while merging.
>
>
> Thanks for rebasing/cherry-picking the series and applying my newest
> changes. It looks like a couple of your squashed fixes in the rebase
> of the old commits ...
Thanks for rebooting the effort. The above wasn't a serious attempt
to re-queue the series to be polished for 'next'---to me, this
branch was primarily to keep track of your interim 29+fractional
patches until "the real thing", possibly rebased to newer codebase,
gets submitted.
> Also, the newest patches can still be fooled by a specially crafted
> rename/add conflict, but I believe with a small restructure I can both
> simplify the code and cover all the cases.
That's nice. Very much looking forward to the updates.
Thanks.
next prev parent reply other threads:[~2018-04-18 21:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 6:07 What's cooking in git.git (Apr 2018, #02; Tue, 17) Junio C Hamano
2018-04-17 14:04 ` Eric Sunshine
2018-04-17 18:05 ` Stefan Beller
2018-04-18 1:04 ` Junio C Hamano
2018-04-18 12:50 ` Derrick Stolee
2018-04-18 20:56 ` Junio C Hamano
2018-04-18 13:09 ` Jonathan Tan
2018-04-18 20:57 ` Junio C Hamano
2018-04-18 15:17 ` Christian Hesse
2018-04-18 21:00 ` Junio C Hamano
2018-04-18 19:39 ` Elijah Newren
2018-04-18 21:04 ` Junio C Hamano [this message]
2018-04-19 11:52 ` Sergey Organov
2018-04-20 22:18 ` js/rebase-recreate-merges, was " Johannes Schindelin
2018-04-22 20:17 ` Taylor Blau
2018-04-22 23:33 ` Junio C Hamano
2018-04-22 23:38 ` Taylor Blau
2018-04-23 13:56 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzi20grab.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).