From: "Shawn O. Pearce" <spearce@spearce.org>
To: Andy Parkins <andyparkins@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: Opinions on bug fix organisation
Date: Wed, 16 May 2007 17:38:19 -0400 [thread overview]
Message-ID: <20070516213819.GT3141@spearce.org> (raw)
In-Reply-To: <200705162220.15417.andyparkins@gmail.com>
Andy Parkins <andyparkins@gmail.com> wrote:
> What is your preference when, for example, you have already merged a
> topic to next but then a bug fix appears?
>
> * -- * -- * -- M -- F * -- * -- * -- M -- m (next)
> / or / /
> B -- * -- * B -- * -- * -- F (topic)
>
> F is certainly most appropriate to be on the topic branch, but we create
> a perhaps excessively verbose extra merge, m.
Look at the history of the next branch; the diagram on the right is
exactly what Junio does. When topic finally graduates to master,
only F is merged to master, making master's own history not show
that "verbose extra merge" m. Or M really for that matter, as
master gets its own M'.
--
Shawn.
next prev parent reply other threads:[~2007-05-16 21:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-16 10:38 Opinions on bug fix organisation Andy Parkins
2007-05-16 14:46 ` Brian Gernhardt
2007-05-16 17:55 ` Junio C Hamano
2007-05-16 21:20 ` Andy Parkins
2007-05-16 21:38 ` Shawn O. Pearce [this message]
2007-05-18 8:11 ` Johannes Sixt
2007-05-16 21:51 ` Martin Langhoff
2007-05-18 19:50 ` Jan Hudec
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=20070516213819.GT3141@spearce.org \
--to=spearce@spearce.org \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).