Gentoo Archives: gentoo-scm

From: Mike Auty <ikelos@g.o>
To: Donnie Berkholz <dberkholz@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:26:28
Message-Id: 49909F7F.4000700@gentoo.org
In Reply to: [gentoo-scm] Retaining history from overlays to the main tree by Donnie Berkholz
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Donnie Berkholz wrote:
> I just came across a tool that may solve my previous concerns about > losing history when moving from an overlay to the main tree: > git-stitch-repo > <http://search.cpan.org/~book/Git-FastExport-0.07/script/git-stitch-repo>. > It's not part of the main git distribution, it's a standalone script.
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... Either way, it's good there's a solution to your problem. Does that mean people are happier about moving ahead with 1repo/tree or are there still other concerns? Mike 5:) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAkmQn34ACgkQu7rWomwgFXpcBACcCPthMXCS82NNRNL3VlB3FQRB 7DEAn2epMBCxxcH/rtGwqa7dv2ViWkR7 =Mmtd -----END PGP SIGNATURE-----

Replies

Subject Author
Re: [gentoo-scm] Retaining history from overlays to the main tree Donnie Berkholz <dberkholz@g.o>