In case you didn't know, I'm currently doing uplifts of bugs to our branches. If you have your flags set correctly and your patches apply cleanly on v1-train and v1.0.0, you shouldn't have anything to worry about. As a reminder, here's what you need to do to have your bug uplifted:
v1-train -- currently, this is code that's going into v1.0.0 and v1.0.1 ======================================================================= * RESOLVED->FIXED * approval-gaia-v1 set to '+' on the patch or PR redirect that fixes your bug v1.0.0 -- currently, this is code that's going into v1.0.1 and later ==================================================================== * RESOLVED->FIXED * the blocking-b2g tracking flag set to tef+ If you need to uplift a patch yourself because of merge conflicts or would just rather do it yourself, please make sure that you set the status-b2g18 and status-b2g18-v1.0.0 flags correctly. Here's what you should change: tef+ bugs (v1.0.0 and v1.0.1) ============================= * When you push your changes to v1-train, set status-b2g18 to 'fixed' * When you push your changes to v1.0.0, set status-b2g18-v1.0.0 to 'fixed' approval-gaia-v1 only (v1.0.1) ========================= * When you push your changes to v1-train, set status-b2g18 to 'fixed' * Don't change status-b2g18-v1.0.0 Thanks for your help in keeping bug statuses sane! John Ford _______________________________________________ dev-b2g mailing list [email protected] https://lists.mozilla.org/listinfo/dev-b2g
