From: Junio C Hamano <gitster@pobox.com>
To: Joel Holdsworth <jholdsworth@nvidia.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Luke Diamand <luke@diamand.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com>,
Dorgon Chang <dorgonman@hotmail.com>,
Joachim Kuebart <joachim.kuebart@gmail.com>,
Daniel Levin <dendy.ua@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Ben Keene <seraphire@gmail.com>,
Andrew Oakley <andrew@adoakley.name>
Subject: Re: [PATCH v3 00/21] git-p4: Various code tidy-ups
Date: Thu, 03 Feb 2022 13:30:47 -0800 [thread overview]
Message-ID: <xmqq8rurskmw.fsf@gitster.g> (raw)
In-Reply-To: <BL0PR12MB4849847CD8385F0FABD9AE95C8289@BL0PR12MB4849.namprd12.prod.outlook.com> (Joel Holdsworth's message of "Thu, 3 Feb 2022 21:22:22 +0000")
Joel Holdsworth <jholdsworth@nvidia.com> writes:
> At what point will the next branch be merged into master? At the
> point of the next release, or before? I couldn't find any
> information about it.
Each topic that is in 'next' is merged to 'master' individually when
it is ready, so topics A, B, and C may have got merged to 'next' in
this order, but only A and C may be merged while B may stay in
'next' while waiting for necessary follow-on work.
The answer is "'next' is never merged as a whole to 'master'". From
time to time, the tip of 'next' and 'master' may happen to have the
same tree when all topics merged to 'next' have graduated to
'master' while no new topics become ready for 'next', but that is a
mere coincidence and not a designed part of the workflow.
Perhaps looking for "Note from the maintainer" in the list archive
would find more info, hopefully?
> The SubmittingPatches guide talks about branching off master, and merging the prerequisite topic branches. For this patch-set I will need:
>
> * jh/p4-spawning-external-commands-cleanup
> * jh/p4-fix-use-of-process-error-exception
> * ab/config-based-hooks-2
Correct. FWIW, I was updating the "What's cooking" report and am
planning to propose merging the first two to 'master' either today
or tomorrow as part of the first batch, and the last one in the next
batch after a few days.
> If I then do "git send-email [...] origin/master" you will get all
> these patches included in my emails. Is this expected? It seems
> undesirable.
You'd use "git format-patch [...] $BASE" where $BASE is the commit
you'll locally create by merging these prerequisite topics to
'master'.
Thanks.
next prev parent reply other threads:[~2022-02-03 21:30 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-16 16:05 [PATCH v3 00/21] git-p4: Various code tidy-ups Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 01/21] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 02/21] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-01-17 2:19 ` Junio C Hamano
2022-01-16 16:05 ` [PATCH v3 03/21] git-p4: indent with 4-spaces Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 04/21] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 05/21] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 06/21] git-p4: remove commented code Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 07/21] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 08/21] git-p4: remove padding from lists, tuples and function arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 09/21] git-p4: remove spaces around default arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 10/21] git-p4: removed brackets when assigning multiple return values Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 11/21] git-p4: place a single space after every comma Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 12/21] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 13/21] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 14/21] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 15/21] git-p4: ensure every comment has a single # Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 16/21] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 17/21] git-p4: normalize indentation of lines in conditionals Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 18/21] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 19/21] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 20/21] git-p4: move inline comments to line above Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 21/21] git-p4: seperate multiple statements onto seperate lines Joel Holdsworth
2022-01-17 1:34 ` [PATCH v3 00/21] git-p4: Various code tidy-ups Junio C Hamano
2022-02-03 21:22 ` Joel Holdsworth
2022-02-03 21:30 ` Junio C Hamano [this message]
2022-02-04 12:27 ` Joel Holdsworth
2022-02-04 17:16 ` Junio C Hamano
2022-01-17 2:22 ` 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=xmqq8rurskmw.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=andrew@adoakley.name \
--cc=dendy.ua@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=jholdsworth@nvidia.com \
--cc=joachim.kuebart@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
--cc=seraphire@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tzadik.vanderhoof@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.
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).