List Archive: gentoo-scm
Note: Due to technical difficulties, the Archives are currently not up to date.
provides an alternative service for most mailing lists.c.f. bug 424647
On 21:41 Thu 16 Apr , Caleb Cushing wrote:
> On Thu, Apr 16, 2009 at 9:39 PM, Donnie Berkholz <firstname.lastname@example.org> wrote:
> > Justin Lecher wrote up quick instructions about this, to preserve
> > history when merging from the sci overlay to the main tree. I don't know
> > if it's anywhere besides my inbox
> history is preserved via merges.
I'm pretty sure we all know that. The comparison though is to the
current case, where you just copy files across. A simple merge works
great if your overlay is a copy of the entire tree plus a few commits,
and you want the entire history of changes to every package merged
across. I suspect the more common case is a small overlay with no shared
ancestry, where you only want to merge in commits to a single package.
Developer, Gentoo Linux