From: Matthew DeVore <matvore@comcast.net>
To: Junio C Hamano <gitster@pobox.com>,
Jonathan Tan <jonathantanmy@google.com>
Cc: matvore@google.com, git@vger.kernel.org
Subject: Re: [PATCH v3 0/2] support for filtering trees and blobs based on depth
Date: Wed, 16 Jan 2019 16:14:56 -0800 [thread overview]
Message-ID: <04d6b46f-da87-bde2-1511-a9f2071bf034@comcast.net> (raw)
In-Reply-To: <xmqqbm4hpjyg.fsf@gitster-ct.c.googlers.com>
On 2019/01/15 15:41, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> This is turning out to be messier than I like.
>>
>> The topic is tangled with too many things in flight and I think I
>> reduced its dependencies down to nd/the-index and
>> sb/more-repo-in-api plus then-current tip of master (and that is why
>> it is based on a1411cecc7), but it seems that it wants a bit more
>> than that; builtin/rebase.c at its tip does not even compile, so
>> I'll need to wiggle the topic before it can go to 'next'.
> Half false alarm. I do need to wiggle the topic, but that was not
> because the choice of base was bad. It was that nd/the-index plus
> sb/more-repo-in-api had semantic merge conflicts with the then-current
> master.
If I understand right, this is a product of the fact that you had to
merge these branches together and base my change on top of them, and
that is a result of that fact that I didn't work on top of master for
the first iterations of the patch.
Sorry about that. My last re-roll was based on master (commit 77556354)
but I guess before I sent that version of the patch set I had already
done some damage by working off of next for the earlier patches.
I think my last version of the patch was fine since it was based off
master. Let me know if I've misunderstood.
>> And worse yet, it seems that filter-options-should-use-plain-int
>> topic depends on this topic in turn as it wants to use
>> LOFC_TREEE_DEPTH.
> This part is still true. The scaling-factor-over-the-wire topic
> does need to be rebuilt on top of this one.
This seems like a easier problem to understand, but I'm not sure how to
avoid this issue in the future.
Thanks,
Matt
next prev parent reply other threads:[~2019-01-17 0:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 23:40 [PATCH v2 0/2] support for filtering trees and blobs based on depth Matthew DeVore
2018-12-10 23:40 ` [PATCH v2 1/2] list-objects-filter: teach tree:# how to handle >0 Matthew DeVore
2019-01-08 1:56 ` Jonathan Tan
2019-01-08 19:22 ` Matthew DeVore
2019-01-08 23:19 ` Jonathan Tan
2019-01-08 23:36 ` Junio C Hamano
2019-01-08 23:41 ` Jonathan Tan
2019-01-08 23:39 ` Junio C Hamano
2019-01-09 2:43 ` MATTHEW DEVORE
2018-12-10 23:40 ` [PATCH v2 2/2] tree:<depth>: skip some trees even when collecting omits Matthew DeVore
2019-01-08 2:00 ` Jonathan Tan
2019-01-08 23:22 ` Jonathan Tan
2019-01-09 2:47 ` MATTHEW DEVORE
2019-01-09 0:29 ` Matthew DeVore
2018-12-11 8:45 ` [PATCH v2 0/2] support for filtering trees and blobs based on depth Junio C Hamano
2019-01-08 0:56 ` Matthew DeVore
2019-01-09 2:59 ` [PATCH v3 " Matthew DeVore
2019-01-09 2:59 ` [PATCH v3 1/2] list-objects-filter: teach tree:# how to handle >0 Matthew DeVore
2019-01-09 2:59 ` [PATCH v3 2/2] tree:<depth>: skip some trees even when collecting omits Matthew DeVore
2019-01-09 18:06 ` [PATCH v3 0/2] support for filtering trees and blobs based on depth Jonathan Tan
2019-01-15 23:35 ` Junio C Hamano
2019-01-15 23:41 ` Junio C Hamano
2019-01-17 0:14 ` Matthew DeVore [this message]
2019-01-17 18:44 ` 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=04d6b46f-da87-bde2-1511-a9f2071bf034@comcast.net \
--to=matvore@comcast.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=matvore@google.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).