From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SbXfk-0004WC-Nl for garchives@archives.gentoo.org; Mon, 04 Jun 2012 13:50:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBAB5E0738; Mon, 4 Jun 2012 13:50:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 12EF3E0667 for ; Mon, 4 Jun 2012 13:49:19 +0000 (UTC) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: djc) by smtp.gentoo.org (Postfix) with ESMTPSA id B404F1B4013 for ; Mon, 4 Jun 2012 13:49:18 +0000 (UTC) Received: by wgbfm10 with SMTP id fm10so3748545wgb.10 for ; Mon, 04 Jun 2012 06:49:16 -0700 (PDT) Received: by 10.216.139.19 with SMTP id b19mr11540431wej.4.1338817756320; Mon, 04 Jun 2012 06:49:16 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Received: by 10.216.168.82 with HTTP; Mon, 4 Jun 2012 06:48:56 -0700 (PDT) In-Reply-To: References: <201206031239.21744.dilfridge@gentoo.org> <201206032135.49757.dilfridge@gentoo.org> From: Dirkjan Ochtman Date: Mon, 4 Jun 2012 15:48:56 +0200 Message-ID: Subject: Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing To: gentoo-dev@lists.gentoo.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6ee4b182-687a-4533-9203-e257ba6ddaa5 X-Archives-Hash: a8cfb54d4401f4aede25f7a76af2acf3 On Mon, Jun 4, 2012 at 3:40 PM, Rich Freeman wrote: > The only thing the merge commit contains is a list of two parents, and > a tree. =C2=A0It doesn't say which one is which, unless we can rely on > their order. You simply walk the tree from root to tip. When you encounter an unsigned changeset, the nearest signed descendant is responsible for merging that changeset. Cheers, Dirkjan