Re: What's (not) cooking
- Date: Fri, 6 Jul 2018 19:16:04 -0700
- From: Elijah Newren <newren@xxxxxxxxx>
- Subject: Re: What's (not) cooking
On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano <gitster@xxxxxxxxx> 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.
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/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.