1 |
On Fri, Jun 01, 2012 at 12:57:10PM +0000, Duncan wrote: |
2 |
> William Hubbs posted on Thu, 31 May 2012 15:57:14 -0500 as excerpted: |
3 |
> > Overlays aren't really part of this discussion; those are independent |
4 |
> > trees which we have no control over, so commiting changes from overlays |
5 |
> > to the main tree is the responsibility of the overlay maintainers. |
6 |
> |
7 |
> But it seems to me that overlays are the primary use case for commits to |
8 |
> public trees other than gentoo first. Otherwise, the whole rebase-vs- |
9 |
> merge problem goes away, because the first public commit is to the gentoo |
10 |
> tree. But especially with overlays (like kde) that have an overlay- |
11 |
> first, test, then gentoo-tree, policy, that public overlay tree (which is |
12 |
> already in git) is part of the process. Commits MUST go thru the overlay |
13 |
> to get to the tree, and that overlay is public, so constant rebasing is a |
14 |
> definite no-no. |
15 |
> |
16 |
> Which unless your workaround idea works, pretty much leaves us with merge- |
17 |
> commits as a necessity. (Which of course, as Ciaran pointed out, are |
18 |
> part of the point of git, such that running git without merge-commits |
19 |
> defeats part of the purpose of the whole exercise.) |
20 |
|
21 |
Overlays are completely separate repositories. There is nothing stopping |
22 |
an overlay from using git right now even if the main tree isn't using |
23 |
git. They just work in their git repositories until they are ready to |
24 |
commit something to the main tree, then they move the changes to the |
25 |
main tree. |
26 |
|
27 |
What the main tree on git would give them is the ability to create a |
28 |
branch from the main tree for their changes, but that would not be pushed |
29 |
to the main repository. |
30 |
|
31 |
All they would have to do when they are ready for their code to be |
32 |
merged back into the main repository is make sure that they are creating |
33 |
a fast-forward merge so that there is no merge commit on the master |
34 |
branch. |
35 |
|
36 |
William |