From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Jeff King" <peff@peff.net>,
"Martin Ågren" <martin.agren@gmail.com>,
git@vger.kernel.org, "Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`
Date: Wed, 06 Feb 2019 09:24:57 -0800 [thread overview]
Message-ID: <xmqqsgx0rfrq.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1902061303570.41@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Wed, 6 Feb 2019 13:20:47 +0100 (STD)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> For a topic like doc-diff that is primarily meant for developers and
>> documenters, it does not matter much, but for an old but important bug,
>> forking the topic to fix it at a point close to the origin is
>> crucial---that is what would allow people to merge the fix to an older
>> maintenance track, without cherry-picking. It is especially true when
>> the bug being fixed is more severe than unrelated breakages that have
>> been fixed since then.
>
> As I said, I understand your reasoning.
When I am following-up to the mailing list, not replying directly
and solely to you, I may write things that I know you already know
to help others reading from sidelines. Just saying I agree, without
sounding as if saying "you do not have to say that", would be better.
>> - Perhaps find the fork point, run tests to find known breakages
>> and exclude them? This would simply be not practical, as it
>> doubles the number of tests run, for individual topic branches
>> because there are an order of magnitude more of them than the
>> primary integration branches.
>
> I saw another strategy in action: accept the base commit chosen by the
> contributor, and ask to back-port it to previous, still supported versions
> (unless an automated rebase managed to back-port already).
It sounds more like "notice the base commit chosen by the
contributor, reject the series and ask to rebase on a fork point of
my choice". That's not all that different from "notice the base
commit chosen by the contributor, rebase on a more sensible fork
point myself, and double-check the result by merging it to the base
commit chosen by the contributor and make sure there is no
unmanageable conflict".
next prev parent reply other threads:[~2019-02-06 17:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-03 8:35 [PATCH] doc-diff: don't `cd_to_toplevel` before calling `usage` Martin Ågren
2019-02-03 9:08 ` Eric Sunshine
2019-02-03 9:11 ` Eric Sunshine
2019-02-03 10:35 ` Martin Ågren
2019-02-03 11:01 ` Eric Sunshine
2019-02-03 11:08 ` [PATCH v2] " Martin Ågren
2019-02-03 23:01 ` Jeff King
2019-02-04 20:50 ` [PATCH v3] doc-diff: don't `cd_to_toplevel` Martin Ågren
2019-02-04 23:34 ` Jeff King
2019-02-05 10:34 ` Johannes Schindelin
2019-02-05 18:45 ` Junio C Hamano
2019-02-06 12:20 ` Johannes Schindelin
2019-02-06 17:24 ` Junio C Hamano [this message]
2019-02-06 18:55 ` Jeff King
2019-02-07 15:41 ` Johannes Schindelin
2019-02-07 17:37 ` Junio C Hamano
2019-02-07 21:34 ` Johannes Schindelin
2019-02-07 20:49 ` Jeff King
2019-02-07 21:42 ` Johannes Schindelin
2019-02-06 18:49 ` Jeff King
2019-02-07 14:26 ` Johannes Schindelin
2019-02-07 20:45 ` Jeff King
2019-02-07 21:57 ` Johannes Schindelin
2019-02-08 2:53 ` Jeff King
2019-02-08 4:34 ` Jeff King
2019-02-08 0:58 ` SZEDER Gábor
2019-02-08 2:51 ` Jeff King
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=xmqqsgx0rfrq.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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).