1 |
On Fri, Jun 01, 2012 at 04:33:35PM +0000, Robin H. Johnson wrote: |
2 |
> On Fri, Jun 01, 2012 at 10:45:48AM -0500, William Hubbs wrote: |
3 |
> > Overlays are completely separate repositories. There is nothing stopping |
4 |
> > an overlay from using git right now even if the main tree isn't using |
5 |
> > git. They just work in their git repositories until they are ready to |
6 |
> > commit something to the main tree, then they move the changes to the |
7 |
> > main tree. |
8 |
> What about overlay repositories that elect to be a branch of the main |
9 |
> tree via git? |
10 |
> |
11 |
> Do we call that forbidden usage? |
12 |
|
13 |
No, it just would mean that they have to know how to rebase their |
14 |
changes on master before they commit. |
15 |
|
16 |
They would clone the main tree to their overlay location, then make a |
17 |
kde branch in their location. That branch would be where they did their |
18 |
work and they would keep master in sync with the main tree (upstream) by |
19 |
running git pull. |
20 |
|
21 |
To merge the overlay changes into the master, a developer would use a |
22 |
git remote to add the kde overlay to his tree, add a kde branch that |
23 |
tracked the remote kde branch, rebase that on current master, merge it |
24 |
into master to create a fast-forward merge then push. |
25 |
|
26 |
I think that probably sounds more complicated than it is, so let me know |
27 |
if you need clarification. |
28 |
|
29 |
William |