[Openchrome-users] merging modular

[John Robinson]

On 05/12/2005 21:29, Thomas Hellstr?m wrote:
> Hmm, this seems to be a bit more complicated than I thought. Changes to
> a file in the trunk after it has been merged will not remain in the
> merge, since the files move. I have to do that manually, which is not a
> big deal.
> 
> However, we have to terminate all branches for this to work in the future.
> 
> So could I have some opinions wether we should move to the new file
> structure or if we should keep the old one? It's still possible to make
> a modular build using the old structure, It's only a matter of changing
> the Makefiles.

If it's a matter of choice, I'd suggest getting as much of the good new
stuff as possible into X.org 6.9/7.0 before its final freeze and
release. If that means making the structure fit modular properly, then
do it; if the opposite, then don't.

Cheers,

John.