From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Nguyễn Thái Ngọc" <pclouds@gmail.com>,
kgybels@infogroep.be
Subject: Re: What's (not) cooking
Date: Fri, 6 Jul 2018 19:16:04 -0700 [thread overview]
Message-ID: <CABPp-BFs1gYzBY5+QrrLEB5kJTaierSGDnYWs=5HKRcPksx9cw@mail.gmail.com> (raw)
In-Reply-To: <xmqqlgaogeff.fsf@gitster-ct.c.googlers.com>
On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano <gitster@pobox.com> wrote:
> I'll be pushing out the integration branches with some updates, but
> there is no change in 'next' and below. The following topics I gave
> a quick look and gave them topic branches, but I had trouble merging
> them in 'pu' and making them work correctly or pass the tests, so
> they are not part of 'pu' in today's pushout.
>
> pk/rebase-in-c
> en/dirty-merge-fixes
> en/t6036-merge-recursive-tests
> en/t6042-insane-merge-rename-testcases
> ds/multi-pack-index
It looks to me like the main problem is that pu itself has lots of
test failures. It seems to bisect down to
kg/gc-auto-windows-workaround. If I revert commit ac9d3fdbebbd ("gc
--auto: clear repository before auto packing", 2018-07-04), then pu
passes tests again for me. With that reverted, I can merge
en/t6036-merge-recursive-tests and
en/t6042-insane-merge-rename-testcases without conflicts and the tests
pass without incident.
The other three topics all have merge conflicts.
en/dirty-merge-fixes has a small conflict with the new topic
nd/use-the-index-compat-less, which I mentioned as a possibility in
the cover letter to my series. I'm happy to do whatever makes it
easiest for you to pick up; I can easily rebase on that topic branch,
but I thought you wanted to see that topic redone first (to avoid
"useless churn"), so I'm unsure what the right next step is.
next prev parent reply other threads:[~2018-07-07 2:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-06 22:57 What's (not) cooking Junio C Hamano
2018-07-06 23:07 ` Junio C Hamano
2018-07-07 2:16 ` Elijah Newren [this message]
2018-07-07 12:11 ` Johannes Schindelin
2018-07-07 15:34 ` Elijah Newren
2018-07-07 22:54 ` Kim Gybels
2018-07-07 12:08 ` Johannes Schindelin
2018-07-09 13:50 ` Derrick Stolee
2018-07-09 16:13 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BFs1gYzBY5+QrrLEB5kJTaierSGDnYWs=5HKRcPksx9cw@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kgybels@infogroep.be \
--cc=pclouds@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).