From: William Hubbs <williamh@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] Re: Portage Git migration - clean cut or git-cvsserver
Date: Thu, 31 May 2012 14:18:04 -0500 [thread overview]
Message-ID: <20120531191804.GA24784@linux1> (raw)
In-Reply-To: <CAGfcS_mSMrS5oYJL3+v2qiCN=efNPestH3je2L7fLvmch2sdVQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1146 bytes --]
On Thu, May 31, 2012 at 01:48:29PM -0400, Rich Freeman wrote:
> On Thu, May 31, 2012 at 12:49 PM, Robin H. Johnson <robbat2@gentoo.org> wrote:
> > 1.
> > Discussion on merge policy. Originally I thought we would disallow merge
> > commits, so that we would get a cleaner history. However, it turns out that if
> > the repo ends up being pushed to different places with slightly different
> > histories, merges are absolutely going to be required to prevent somebody from
> > having to rebase at least one of their sets of commits that are already pushed.
>
> Not sure I'm following, but I will be the first to admit that I'm a
> git novice. Would this be aided by a convention, like only committing
> to master on the gentoo official repository, and any on-the-side work
> on places like github/etc stays in branches? Those repositories would
> just keep getting fed commits on master from the official repository.
Iagree with this; I think we should ban merge commits on master. That
would force everyone to rebase their work on current master before they
commit to master which would make the history clean.
William
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2012-05-31 19:19 UTC|newest]
Thread overview: 163+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-23 12:42 [gentoo-dev] Portage Git migration - clean cut or git-cvsserver Michael Weber
2012-05-23 12:54 ` Johannes Huber
2012-05-23 13:14 ` Ian Whyman
2012-05-23 13:31 ` Matthew Thode
2012-05-23 14:39 ` Alexey Shvetsov
2012-05-23 14:43 ` Anthony G. Basile
2012-05-23 16:33 ` Rich Freeman
2012-05-23 13:25 ` Andreas K. Huettel
2012-05-23 13:28 ` Aaron W. Swenson
2012-05-23 13:34 ` Fabio Erculiani
2012-05-23 14:17 ` [gentoo-dev] " Michael Palimaka
2012-05-23 14:54 ` [gentoo-dev] " justin
2012-05-23 16:32 ` Sergei Trofimovich
2012-05-23 16:33 ` Michał Górny
2012-05-23 16:42 ` Andreas K. Huettel
2012-05-23 16:45 ` Alexey Shvetsov
2012-05-24 19:51 ` Marc Schiffbauer
2012-05-23 16:47 ` Robin H. Johnson
2012-05-23 16:58 ` Alexey Shvetsov
2012-05-23 17:19 ` Robin H. Johnson
2012-05-23 17:22 ` Alexey Shvetsov
2012-05-23 17:32 ` Rich Freeman
2012-05-23 17:35 ` Alexey Shvetsov
2012-05-24 10:02 ` Kent Fredric
2012-05-24 10:16 ` Alexey Shvetsov
2012-05-23 17:38 ` Robin H. Johnson
2012-05-23 17:38 ` Chí-Thanh Christopher Nguyễn
2012-05-23 18:37 ` Rafael Goncalves Martins
2012-05-23 19:37 ` Arun Raghavan
2012-05-23 19:40 ` Nirbheek Chauhan
2012-05-23 19:47 ` Fabio Erculiani
2012-05-23 19:51 ` hasufell
2012-05-23 20:00 ` Ezequiel Garcia
2012-05-23 20:32 ` Rich Freeman
2012-05-24 10:08 ` Kent Fredric
2012-05-24 6:34 ` Pacho Ramos
2012-05-23 20:05 ` Alexey Shvetsov
2012-05-23 20:25 ` William Hubbs
2012-05-23 20:37 ` Michał Górny
2012-05-23 20:55 ` William Hubbs
2012-05-24 4:49 ` Matt Turner
2012-05-23 16:58 ` Justin
2012-05-23 20:34 ` Michael Weber
2012-05-23 16:59 ` Matt Turner
2012-05-23 17:06 ` Alexey Shvetsov
2012-05-23 20:39 ` Michael Weber
2012-05-23 17:09 ` Alexey Shvetsov
2012-05-23 21:14 ` Dan Douglas
2012-05-23 21:48 ` Michael Weber
2012-05-24 10:17 ` Kent Fredric
2012-05-24 14:40 ` Michał Górny
2012-05-24 15:02 ` Ralph Sennhauser
2012-05-24 15:32 ` Rich Freeman
2012-05-25 1:21 ` Alec Warner
2012-05-25 1:32 ` Kent Fredric
2012-05-25 6:12 ` Ulrich Mueller
2012-05-25 6:47 ` Kent Fredric
2012-05-25 11:07 ` Alec Warner
2012-05-24 15:40 ` Michał Górny
2012-05-24 17:13 ` Kent Fredric
2012-05-24 17:52 ` Ian Stakenvicius
2012-05-24 18:08 ` Ciaran McCreesh
2012-05-24 18:17 ` Kent Fredric
2012-05-24 18:33 ` Markos Chandras
2012-05-24 18:37 ` Dan Douglas
[not found] ` <4FBE8223.2010406@gentoo.org>
2012-05-24 19:57 ` Dan Douglas
2012-05-24 21:00 ` [gentoo-dev] Portage Git migration - Handling Pull Requests (Was: clean cut or git-cvsserver) Aaron W. Swenson
2012-05-24 21:14 ` Alexey Shvetsov
2012-05-24 21:20 ` Kent Fredric
2012-05-24 21:27 ` Alexey Shvetsov
2012-05-24 21:16 ` Kent Fredric
2012-05-24 22:01 ` Dan Douglas
2012-05-25 0:58 ` Rich Freeman
2012-05-25 1:40 ` Maxim Kammerer
2012-05-24 5:56 ` [gentoo-dev] Portage Git migration - clean cut or git-cvsserver Michał Górny
2012-05-24 6:04 ` Dan Douglas
2012-05-24 6:33 ` [gentoo-dev] " Duncan
2012-05-24 6:51 ` Dan Douglas
2012-05-24 9:16 ` Vítor Brandão
2012-05-24 11:43 ` Duncan
2012-05-24 12:05 ` Dirkjan Ochtman
2012-05-24 13:03 ` Ciaran McCreesh
2012-05-24 13:37 ` Kent Fredric
2012-05-24 13:51 ` Michael Weber
2012-05-24 1:19 ` [gentoo-dev] " Mark Wright
2012-05-24 16:17 ` Ultrabug
2012-05-26 16:18 ` Alexey Shvetsov
2012-05-30 1:55 ` Rich Freeman
2012-05-30 9:38 ` [gentoo-dev] " Duncan
2012-05-30 10:16 ` Dirkjan Ochtman
2012-05-30 11:32 ` Rich Freeman
2012-05-30 13:06 ` Duncan
2012-05-30 18:33 ` Robin H. Johnson
2012-05-30 20:31 ` Dirkjan Ochtman
2012-05-31 12:04 ` Aaron W. Swenson
2012-05-31 12:16 ` Peter Stuge
2012-05-31 12:21 ` Dirkjan Ochtman
2012-05-31 16:50 ` Robin H. Johnson
2012-06-01 20:49 ` Michael Weber
2012-06-02 0:52 ` Rich Freeman
2012-06-02 4:04 ` Robin H. Johnson
2012-06-02 10:59 ` Rich Freeman
2012-06-02 12:03 ` Dirkjan Ochtman
2012-06-02 14:19 ` Rich Freeman
2012-05-31 16:49 ` Robin H. Johnson
2012-05-31 17:48 ` Rich Freeman
2012-05-31 19:13 ` Robin H. Johnson
2012-05-31 19:29 ` Rich Freeman
2012-05-31 19:54 ` William Hubbs
2012-05-31 20:26 ` Duncan
2012-05-31 20:57 ` William Hubbs
2012-06-01 12:57 ` Duncan
2012-06-01 13:25 ` Nicolas Sebrecht
2012-06-01 15:08 ` Andreas K. Huettel
2012-06-01 15:39 ` Rich Freeman
2012-06-01 15:56 ` Kent Fredric
2012-06-01 16:18 ` W. Trevor King
2012-06-01 15:45 ` William Hubbs
2012-06-01 16:33 ` Robin H. Johnson
2012-06-01 16:55 ` Kent Fredric
2012-06-01 18:28 ` Rich Freeman
2012-06-01 19:22 ` William Hubbs
2012-05-31 22:04 ` Kent Fredric
2012-05-31 19:18 ` William Hubbs [this message]
2012-05-31 19:23 ` Ciaran McCreesh
2012-05-31 22:04 ` William Hubbs
2012-05-31 22:28 ` Peter Stuge
2012-06-01 3:59 ` Michał Górny
2012-06-02 0:14 ` James Cloos
2012-05-31 19:33 ` Michał Górny
2012-05-31 19:52 ` Alexey Shvetsov
2012-05-31 21:52 ` Kent Fredric
2012-06-01 2:49 ` Rich Freeman
2012-06-01 4:55 ` Kent Fredric
2012-06-01 10:54 ` Rich Freeman
2012-06-01 11:23 ` Kent Fredric
2012-06-01 11:44 ` Michał Górny
2012-06-01 12:42 ` Rich Freeman
2012-06-01 12:48 ` Alexey Shvetsov
2012-06-01 14:37 ` Kent Fredric
2012-06-01 15:12 ` Andreas K. Huettel
2012-06-01 15:25 ` Kent Fredric
2012-06-01 15:36 ` Andreas K. Huettel
2012-06-01 15:53 ` Rich Freeman
2012-06-01 16:12 ` Dirkjan Ochtman
2012-06-01 16:14 ` Kent Fredric
2012-06-01 16:34 ` Robin H. Johnson
2012-06-01 16:56 ` Kent Fredric
2012-06-01 17:36 ` Robin H. Johnson
2012-06-01 15:39 ` Michał Górny
2012-06-01 15:28 ` Rich Freeman
2012-05-31 19:58 ` Rich Freeman
2012-05-31 20:09 ` Michał Górny
2012-05-31 20:27 ` Michael Orlitzky
2012-06-01 4:05 ` Michał Górny
2012-06-01 10:49 ` Rich Freeman
2012-05-31 21:06 ` William Hubbs
2012-05-31 22:00 ` Kent Fredric
2012-06-01 8:16 ` Dirkjan Ochtman
2012-06-01 8:40 ` Kent Fredric
2012-05-30 16:53 ` Tobias Klausmann
2012-05-30 16:58 ` Aaron W. Swenson
2012-05-30 18:12 ` Justin
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=20120531191804.GA24784@linux1 \
--to=williamh@gentoo.org \
--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