How to land code without landing code in b2g

Jed Parsons jparsons at mozilla.com
Mon Nov 18 15:34:12 PST 2013



> De: "Chris Karlof" <ckarlof at mozilla.com>
> Enviados: Lunes, 18 de Noviembre 2013 15:20:49 
> 
> On Nov 18, 2013, at 2:26 PM, Jed Parsons <jparsons at mozilla.com> wrote:
> 
> > 
> > Question:
> > 
> > We want to land our patches in m-c trunk and gaia master.  However, if we
> > do so before Dec 9, they will automatically get uplifted into b2g 1.3,
> > which we don't want.  What should we do?
> > 
> > According to jsmith, there is no way to flag a checkin in order that it
> > *not* be included in a certain revision.
> > 
> > We appear to have several options:
> > 
> > 1. Pursue reviews, but don't tag anything with 'checkin-needed' until Dec
> > 10
> > 
> > 2. Create a new branch to work in
> > 
> > 3. Work normally, but have a pref/build config for FXA on FXOS
> > 
> > The latter (3) still seems risky to me.
> > 
> > If it's not too much trouble, I'm inclined to try to set up a new branch,
> > and keep rebasing m-c.  I'm inclined not to work in the 'elm' branch, as I
> > think it will be difficult to disentangle our work from other work being
> > done there.
> > 
> 
> I don't want to fork the shared FxA service or FxAClient between two efforts.
> If the shared FxA code can land in one place (m-c?), that would be great.
> 
> -chris

I expect the FxAccounts service and client should be safe to land in m-c at any date.

I think it's the gaia patches and the gecko patches that touch Identity and b2g that we need to make a plan for.

j

> 
> > Thoughts?  Preferences?
> > 
> > j
> > _______________________________________________
> > Dev-fxacct mailing list
> > Dev-fxacct at mozilla.org
> > https://mail.mozilla.org/listinfo/dev-fxacct
> 
> 



More information about the Dev-fxacct mailing list