All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Steven E. Harris" <seh@panix.com>
To: git@vger.kernel.org
Subject: Re: How does Git's maintenance policy handle topics that don't start from "master?"
Date: Tue, 29 May 2012 17:24:20 -0400	[thread overview]
Message-ID: <m2wr3u4r5n.fsf@Spindle.sehlabs.com> (raw)
In-Reply-To: m21um2682e.fsf@Spindle.sehlabs.com

"Steven E. Harris" <seh@panix.com> writes:

> Is there a part of the policy that addresses this case that I missed?

After posting I discovered the "SubmittingPatches" document¹, which does
address part of my inquiry:

,----[ Decide what to base your work on ]
| - A new feature should be based on 'master' in general. If the new
|    feature depends on a topic that is in 'pu', but not in 'master',
|    base your work on the tip of that topic.
| 
| - Corrections and enhancements to a topic not yet in 'master' should
|    be based on the tip of that topic. If the topic has not been merged
|    to 'next', it's alright to add a note to squash minor corrections
|    into the series.
| 
| - In the exceptional case that a new feature depends on several topics
|    not in 'master', start working on 'next' or 'pu' privately and send
|    out patches for discussion. Before the final merge, you may have to
|    wait until some of the dependent topics graduate to 'master', and
|    rebase your work.
`----

The last one in particular implies that the topic branch will not be fit
for serious consideration until its dependencies have themselves
graduated to "master."

Footnotes: 
¹ https://raw.github.com/git/git/master/Documentation/SubmittingPatches
-- 
Steven E. Harris

  reply	other threads:[~2012-05-29 21:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-29 20:33 How does Git's maintenance policy handle topics that don't start from "master?" Steven E. Harris
2012-05-29 21:24 ` Steven E. Harris [this message]
2012-05-29 21:29 ` Junio C Hamano
2012-05-29 21:51   ` Steven E. Harris
2012-05-29 23:06     ` Junio C Hamano
2012-05-29 23:16       ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2wr3u4r5n.fsf@Spindle.sehlabs.com \
    --to=seh@panix.com \
    --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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.