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-scm
Navigation:
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: Mike Auty <ikelos@g.o>
From: Donnie Berkholz <dberkholz@g.o>
Subject: Re: Retaining history from overlays to the main tree
Date: Mon, 9 Feb 2009 13:50:36 -0800
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: http://dberkholz.wordpress.com
Attachment:
pgpZqTzUMAsCt.pgp (PGP signature)
References:
Retaining history from overlays to the main tree
-- Donnie Berkholz
Re: Retaining history from overlays to the main tree
-- Mike Auty
Navigation:
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: Retaining history from overlays to the main tree
Next by thread:
Update on -council list
Previous by date:
Re: Grafting and small repos
Next by date:
Re: Grafting and small repos


Updated Jun 17, 2009

Summary: Archive of the gentoo-scm mailing list.

Donate to support our development efforts.

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