Gentoo Archives: gentoo-dev

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing
Date: Mon, 04 Jun 2012 13:50:16
Message-Id: CAKmKYaBD0yiq7HRrZ+XcOQ-9=GSiBmcLYEDCS3_oH6=kpzP+yA@mail.gmail.com
In Reply to: Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing by Rich Freeman
On Mon, Jun 4, 2012 at 3:40 PM, Rich Freeman <rich0@g.o> wrote:
> The only thing the merge commit contains is a list of two parents, and > a tree.  It 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

Replies

Subject Author
Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing Rich Freeman <rich0@g.o>