| 1 |
On 21:26 Mon 09 Feb , Mike Auty wrote: |
| 2 |
> Looks good. Will that then let you push the combined tree back into a |
| 3 |
> remote repo? I'm surprised there isn't an easier way to merge two |
| 4 |
> trees, given that git's all about listing the parent commits. I'd have |
| 5 |
> thought you could just import all the commits from the other tree, make |
| 6 |
> a new commit with both as the parents, and possibly prune out |
| 7 |
> dangling/unnecessary commits... |
| 8 |
|
| 9 |
It is easy if the two trees were forked from the same original source. |
| 10 |
But in an overlay situation, people will want to have a small overlay |
| 11 |
repository, which will thus lack knowledge of where the ebuilds came |
| 12 |
from originally. When you want to bring this history back into the main |
| 13 |
tree, there's no common ancestry so merges are nontrivial. |
| 14 |
|
| 15 |
-- |
| 16 |
Thanks, |
| 17 |
Donnie |
| 18 |
|
| 19 |
Donnie Berkholz |
| 20 |
Developer, Gentoo Linux |
| 21 |
Blog: http://dberkholz.wordpress.com |
Archives