From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)
Date: Mon, 11 Jul 2016 10:13:10 -0700 [thread overview]
Message-ID: <xmqqzipo9jyx.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1607110821500.6426@virtualbox> (Johannes Schindelin's message of "Mon, 11 Jul 2016 08:24:49 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> What about the am-call-merge-recursive-directly patch series? As I
> demonstrated by rebasing it to `pu`, it is actually not butchering the
> smudge/clean pathway as you suggested.
What I said was it seemed to conflict with something else, which
butchered that codepath that needed further work. It seems I was
reading the conflicts incorrectly and the conflicts were coming from
other topics like i18n and oid changes.
> I am a bit at a loss here: what can I do to get this picked up?
You can do one of three things, and they apply not specifically to
this case but in general when working with others.
- You can help other topics that collide with what you do to move
forward by helping their reviews. Instead of leaving them
something the still need polishing and requires your topic to get
adjusted every time they change, help them be polished earlier
and become part of the solid foundation you build on top.
- You can wait until that polishing happens to the other topics
that block you.
- You can shoot down the other topics that block you, e.g. "these
are not good ideas", "it aims to do a good thing, but its
implementation is far from ready--it misses this and that cases
among others. I'd recommend ejecting the topic for now and have
it redesigned from scratch", etc., which would shift the issue of
conflicting change to their problem as a side effect.
Rebasing on 'pu' essentially is the second course; you are
explicitly making your topic depend on the others (which creates a
bit more work to me to identify exactly which topics in 'pu' you
absolutely need to decide where to queue your patches, compared to
the case in which you explicitly say "these patches apply to a merge
of topic X and Y on top of v2.9", though).
Also, without _any_ conflicts with other topics, the above three
points apply well when working with others. There are tons of
topics that are marked as "Needs review", and they will not advance
until that happens. When the set of "needs review" topics balloon,
I have to stop picking up non-trivial topics to make time to review
them myself.
Thanks.
prev parent reply other threads:[~2016-07-11 17:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-08 22:59 What's cooking in git.git (Jul 2016, #03; Fri, 8) Junio C Hamano
2016-07-09 23:25 ` Eric Wong
2016-07-11 17:51 ` Junio C Hamano
2016-07-09 23:45 ` Eric Wong
2016-07-10 2:52 ` Jeff King
2016-07-10 3:47 ` Eric Wong
2016-07-10 4:45 ` Jeff King
2016-07-10 8:20 ` [PATCH 3/2] hoist out handle_nonblock function for xread and xwrite Eric Wong
2016-07-11 6:24 ` What's cooking in git.git (Jul 2016, #03; Fri, 8) Johannes Schindelin
2016-07-11 17:13 ` Junio C Hamano [this message]
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=xmqqzipo9jyx.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).