Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-dev
Navigation:
Lists: gentoo-dev: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-dev@g.o
From: Dirkjan Ochtman <djc@g.o>
Subject: Re: Git braindump: 1 of N: merging & git signing
Date: Sun, 3 Jun 2012 18:01:04 +0200
On Sun, Jun 3, 2012 at 12:39 PM, Andreas K. Huettel
<dilfridge@g.o> wrote:
> Sounds reasonable given the current state of git. Let's just be clear about
> the following consequence (I hope I understand this correctly):
>
> * User makes signed improvements in gentoo-x86 clone
> * Developer pulls from user and >merges<
> * Developer's history contains commits by user, which cannot be pushed to
> gentoo-x86
>
> Which means in the end "all merges are explicitly allowed, as long as they
> only contain developer commits; commits pulled from users must be rebased".

I don't think so. IMO pushing commits by a user should be a fine, as
long as they're merged in a non-fast-forward, signed merge commit.

Cheers,

Dirkjan


Replies:
Re: Git braindump: 1 of N: merging & git signing
-- Andreas K. Huettel
References:
Git braindump: 1 of N: merging & git signing
-- Robin H. Johnson
Re: Git braindump: 1 of N: merging & git signing
-- Andreas K. Huettel
Navigation:
Lists: gentoo-dev: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: Git braindump: 1 of N: merging & git signing
Next by thread:
Re: Git braindump: 1 of N: merging & git signing
Previous by date:
Re: Git braindump: 2 of N: developer interaction (merge co-ordinators)
Next by date:
Re: Git braindump: 2 of N: developer interaction (merge co-ordinators)


Updated Jun 29, 2012

Summary: Archive of the gentoo-dev mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.