1 |
On Sunday, October 13, 2013 09:33:53 AM Brian Dolbec wrote: |
2 |
> On Fri, 2013-10-11 at 14:58 -0700, Matt Turner wrote: |
3 |
> > On Fri, Oct 11, 2013 at 2:11 PM, Brian Dolbec <dolsen@g.o> wrote: |
4 |
> > > The default tree location move is waiting on the catalyst rewrite code |
5 |
> > > to go live producing stages, etc.. |
6 |
> > |
7 |
> > I'm exactly sure what this means, but I think you might mean something |
8 |
> > like renaming master to old-master and your branch to master. That's |
9 |
> > not the right way to do it, and that's not how git works. |
10 |
> |
11 |
> No, completely wrong. The default tree location is going to be moved |
12 |
> from /usr/portage to somewhere in /var (they never could agree where) |
13 |
> and distfiles and packages directories are being moved out of the |
14 |
> PORTDIR tree directory. |
15 |
> |
16 |
> Current catalyst master code has tree paths hardcoded everywhere. Not |
17 |
> only that, but the paths are often used as both a path and a variable |
18 |
> name in many places. |
19 |
> |
20 |
> That makes it impossible for the tree move to happen and have catalyst |
21 |
> work correctly to produce stages, etc. with the new default locations. |
22 |
> |
23 |
> That is why I started to work on catalyst in the first place. But the |
24 |
> code is such a mess, I couldn't stop there with the encouragement of |
25 |
> many from the releng team. |
26 |
|
27 |
I think what Matt is suggesting is that you split your rebase-on-master branch |
28 |
into logical series and send them to the list for review and merger into |
29 |
master. A Git workflow is one of incremental, reviewed changes being merged |
30 |
over time. |