Gentoo Archives: gentoo-scm

From: Donnie Berkholz <dberkholz@g.o>
To: Mike Auty <ikelos@g.o>
Cc: gentoo-scm@l.g.o
Subject: Re: [gentoo-scm] Retaining history from overlays to the main tree
Date: Mon, 09 Feb 2009 21:50:38
Message-Id: 20090209215036.GB3686@comet
In Reply to: Re: [gentoo-scm] Retaining history from overlays to the main tree by Mike Auty
On 21:26 Mon 09 Feb     , Mike Auty wrote:
> Looks good. Will that then let you push the combined tree back into a > remote repo? I'm surprised there isn't an easier way to merge two > trees, given that git's all about listing the parent commits. I'd have > thought you could just import all the commits from the other tree, make > a new commit with both as the parents, and possibly prune out > dangling/unnecessary commits...
It is easy if the two trees were forked from the same original source. But in an overlay situation, people will want to have a small overlay repository, which will thus lack knowledge of where the ebuilds came from originally. When you want to bring this history back into the main tree, there's no common ancestry so merges are nontrivial. -- Thanks, Donnie Donnie Berkholz Developer, Gentoo Linux Blog: