| 1 |
On 21:41 Thu 16 Apr , Caleb Cushing wrote: |
| 2 |
> On Thu, Apr 16, 2009 at 9:39 PM, Donnie Berkholz <dberkholz@g.o> wrote: |
| 3 |
> > |
| 4 |
> > Justin Lecher wrote up quick instructions about this, to preserve |
| 5 |
> > history when merging from the sci overlay to the main tree. I don't know |
| 6 |
> > if it's anywhere besides my inbox |
| 7 |
> |
| 8 |
> history is preserved via merges. |
| 9 |
|
| 10 |
I'm pretty sure we all know that. The comparison though is to the |
| 11 |
current case, where you just copy files across. A simple merge works |
| 12 |
great if your overlay is a copy of the entire tree plus a few commits, |
| 13 |
and you want the entire history of changes to every package merged |
| 14 |
across. I suspect the more common case is a small overlay with no shared |
| 15 |
ancestry, where you only want to merge in commits to a single package. |
| 16 |
|
| 17 |
-- |
| 18 |
Thanks, |
| 19 |
Donnie |
| 20 |
|
| 21 |
Donnie Berkholz |
| 22 |
Developer, Gentoo Linux |
| 23 |
Blog: http://dberkholz.wordpress.com |
Archives