From: Duncan <1i5t5.duncan@cox.net>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] Re: On banning merge commits
Date: Sun, 8 May 2016 10:21:31 +0000 (UTC) [thread overview]
Message-ID: <pan$10e4a$77bed5$ffe3838a$eee88f7a@cox.net> (raw)
In-Reply-To: CAATnKFBVHQ-coWr85nPS+6S3xs27UpzC_NHvczgUQOyivFyjMQ@mail.gmail.com
Kent Fredric posted on Sun, 08 May 2016 21:25:38 +1200 as excerpted:
> On 8 May 2016 at 20:58, Duncan <1i5t5.duncan@cox.net> wrote:
>> Or to put it a different way, if we're not going to use git's rich
>> distributed branch development and tracking, forcing everything to
>> single chain on the main tree, why did we bother switching to git in
>> the first place? That was available on cvs, or if we wanted more
>> features, subversion, etc.
>
> I think the annoyance is more having two histories, where on one side,
> you've got the high-traffic gentoo work flow happening, and then you
> have a merge commit ....
>
> And that merge commit may have only a single commit on it, and its
> parent is god-knows how many days old.
>
> So the "graph" looks *massive* when it is really only a single commit
> and its merge commit.
>
> I think the most productive thing here is not to ban "merge commits" as
> such, but ban merge commits where the "merge base" ( that is, the common
> ancestor of the left and right parents of the merge commit ) leaves a
> significant number of commits on the "left" side of the equation. [...]
> "Long histories that go for days only to merge one commit" tend to harm
> this, and I think that's the essential irritation.
OK, that I can agree with. =:^)
--
Duncan - List replies preferred. No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master." Richard Stallman
next prev parent reply other threads:[~2016-05-08 10:21 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-07 23:52 [gentoo-dev] On banning merge commits Patrice Clement
2016-05-08 5:09 ` Michał Górny
2016-05-08 5:44 ` cbergstrom
2016-05-08 8:21 ` Greg KH
2016-05-08 9:35 ` Daniel Campbell
2016-05-08 8:58 ` [gentoo-dev] " Duncan
2016-05-08 9:25 ` Kent Fredric
2016-05-08 10:21 ` Duncan [this message]
2016-05-08 10:35 ` Dirkjan Ochtman
2016-05-08 10:30 ` [gentoo-dev] " Dirkjan Ochtman
2016-05-08 12:00 ` Michał Górny
2016-05-08 12:31 ` Dirkjan Ochtman
2016-05-08 11:13 ` Andreas K. Hüttel
2016-05-08 11:28 ` M. J. Everitt
2016-05-08 9:15 ` Andrew Savchenko
2016-05-08 10:06 ` Amadeusz Żołnowski
2016-05-08 12:53 ` Brian Dolbec
2016-05-08 15:15 ` Jeroen Roovers
2016-05-08 22:25 ` Daniel Campbell
2016-05-08 11:25 ` Andreas K. Hüttel
2016-05-08 11:57 ` Rich Freeman
2016-05-08 12:07 ` Kent Fredric
2016-05-08 21:56 ` [gentoo-dev] " Duncan
2016-05-08 12:09 ` [gentoo-dev] " Anthony G. Basile
2016-05-08 12:18 ` Kent Fredric
2016-05-08 12:34 ` Rich Freeman
2016-05-08 12:43 ` Anthony G. Basile
2016-05-08 22:02 ` [gentoo-dev] " Duncan
2016-05-08 17:03 ` [gentoo-dev] " Alexis Ballier
2016-05-08 17:07 ` Kent Fredric
2016-05-09 11:27 ` Kristian Fiskerstrand
2016-05-09 12:23 ` Rich Freeman
2016-05-09 12:36 ` Kent Fredric
2016-05-09 12:59 ` Rich Freeman
2016-05-10 12:04 ` Alexis Ballier
2016-05-10 14:18 ` Kent Fredric
2016-05-11 10:21 ` Alexis Ballier
2016-05-11 14:34 ` Kent Fredric
2016-05-11 15:12 ` Rich Freeman
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='pan$10e4a$77bed5$ffe3838a$eee88f7a@cox.net' \
--to=1i5t5.duncan@cox.net \
--cc=gentoo-dev@lists.gentoo.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