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

I've read the /Addendum to "MaintNotes"/ document¹ several times in the
last few years, but in the process of trying to employ the policy with
my current team, our progress is stuck on a case that isn't addressed by
the policy -- directly, anyway.

In the policy section "Handle the remaining patches," the first clause
reads as follows:

,----[ First case for remaining patches ]
| Anything unobvious that is applicable to 'master' (in other
| words, does not depend on anything that is still in 'next'
| and not in 'master') is applied to a new topic branch that
| is forked from the tip of 'master'.  This includes both
| enhancements and unobvious fixes to 'master'.
`----

It addresses topics that can be built on top of the "master" branch,
these topics not depending on anything only available outside the
"master" branch, such as in the "next" branch. This policy is focusing
on the receiver and integrator of patches, rather than the author, but
it's not hard to infer that an author should start his work from the
"master" branch in order for his patches to be eligible for treatment by
this clause.

What about the case where an author started his work from the "next"
branch instead? He may have submitted an earlier batch of work that's
still cooking in "next," and now he needs to build something else that
can take advantage of that earlier work. It's clear that if he starts
from "next" and relies on that earlier work, then his later work is not
independent and cannot possibly graduate to the "master" branch unless
and until his earlier work graduates too.

Is the Git policy on such dependency simply, "Don't do that?"

Consider a situation where the earlier topic branch's contribution
cooking in "next" is looking good and everyone is feeling confident that
it's going to graduate, and our poor author /needs/ to get started on
his next task that would make use of the earlier work. If he does start
his new topic branch from "next" -- or maybe starts it from his earlier
topic branch instead -- what will go wrong later? Is there a part of the
policy that addresses this case that I missed?


Footnotes: 
¹ http://www.kernel.org/pub/software/scm/git/docs/v1.7.10.1/howto/maintain-git.txt

-- 
Steven E. Harris

             reply	other threads:[~2012-05-29 20:34 UTC|newest]

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