On Tue, Apr 21, 2009 at 10:13:23PM -0700, Junio C Hamano wrote:
> > Right. Junio branches all topics in git from "master", but then merges
> > promising ones into "next". When the topic is ready for master, he can
> > then just merge the topic branch, pulling in that topic but not the rest
> > of next.
>
> No, I don't.
>
> I often branch from somewhere older than 'master', often tip from 'maint'
> sometimes even older. And that is not necessarily because I am better
> than other people in planning ahead. There are branches that forked from
> older series (like 1.6.0.X) that are merged to next and then master,
> without ever getting merged to produce 1.6.0.(X+1).
Sure, but I assumed a new topic that came in would get branched from
'master', since that is presumably what the person developing it based
it on. Is that not true?
That is also what is in Documentation/howto/maintain-git.txt:
- 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'. A topic
branch is named as ai/topic where "ai" is typically
author's initial and "topic" is a descriptive name of the
topic (in other words, "what's the series is about").
- An unobvious fix meant for 'maint' is applied to a new
topic branch that is forked from the tip of 'maint'. The
topic is named as ai/maint-topic.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html