[OpenIndiana-discuss] Rebranding Work

[Guido Berhoerster]

* Alasdair Lumsden <alasdairrr at gmail.com> [2010-09-01 23:38]:
> 
> On 30 Aug 2010, at 15:48, George Shepherd wrote:
> 
> > So actually you are trying to do more in the gates than
> > we do.
> > 
> > Internally all peer reviews and inspections are done from
> > the engineer's child of the clone. Any revisions are done
> > by the responsible engineer in his child. The child is
> > then normalised (hg reci -f) to compact all changes into
> > one changeset before it is permissible to push your
> > changes back to the gate.
> 
> Right.
> 
> I think the problem we have is that the authoritative source of the code is not ours and our changes need to be merged cleanly with it.
> 
> So I think our clone which gets pulled each night from opensolaris upstream should remain read-only. We then need a clone of this, which maintains our patch queue and where final revision patches get pushed to.
> 
> So we will need a clone of *that* where development takes place, and after review final changes can get pushed up to the one above as a single change set.
> 
> Does that sound sane?

Yes, one would be a pure mirror of the OS.o repo and the other
one the OpenIndiana version. The latter would just be updated
less frequently because maintaining the patch queue involves a
manual process, i.e. unapplying patches, pulling, reapplying
patches/merging/resolving conflicts and adding new patches. The
people responsible for a consolidation could do that each time a
nv build is tagged.

-- 
Guido Berhoerster