Confirmed users
4,467
edits
| Line 192: | Line 192: | ||
** Going to keep going; needs someone to make a call and/or fix the bustage | ** Going to keep going; needs someone to make a call and/or fix the bustage | ||
=====repack===== | |||
===Build 2=== | |||
==== Setup ==== | |||
* Pushed [http://hg.mozilla.org/build/buildbot-configs/rev/844547abac09 configs changes without desktop beta branding]. | |||
* Got go-to-build for [http://hg.mozilla.org/releases/mozilla-aurora/rev/b415c95bdb71 mozilla-aurora rev b415c95bdb71]. | |||
=====Preparing the repos===== | |||
Pulled mozilla-aurora b415c95bdb71 to mozilla-mobile-5.0 | |||
<pre> | |||
hg clone http://hg.mozilla.org/releases/mozilla-mobile-5.0 | |||
cd mozilla-mobile-5.0 | |||
hg pull http://hg.mozilla.org/releases/mozilla-aurora -r b415c95bdb71 | |||
hg up | |||
hg push -e 'ssh -i ~/.ssh/ffxbld_dsa -l ffxbld' ssh://hg.mozilla.org/releases/mozilla-mobile-5.0 | |||
hg ident | |||
# We're already on b415c95bdb71 | |||
hg branch | |||
# We're on default | |||
hg branch 5.0b1_build2 | |||
</pre> | |||
Moved mozilla-mobile-5.0/mobile to mobile-5.0 | |||
<pre> | |||
cd .. | |||
hg clone http://hg.mozilla.org/releases/mobile-5.0 | |||
cd mobile-5.0 | |||
hg branch | |||
# We're on GECKO50b1_20110512_RELBRANCH | |||
hg branch 5.0b1_build2 | |||
cd ../mozilla-mobile-5.0/mobile | |||
rsync -av . ../../mobile-5.0/. | |||
cd ../../mobile-5.0 | |||
ls | |||
hg stat | |||
hg branch | |||
hg addremove | |||
hg commit -m "Bug 654838 create a unique branding for Fennec beta (Maemo parts) r+a=blasssey p=mfinkle" | |||
hg push -f -e 'ssh -i ~/.ssh/ffxbld_dsa -l ffxbld' ssh://hg.mozilla.org/releases/mobile-5.0 | |||
</pre> | |||
Removed mozilla-mobile-5.0/mobile (both on 5.0b1_build2 named branch). This will make future merges conflict-free, though we'll have to do the below for each new changeset: | |||
cd ../mozilla-mobile-5.0 | |||
hg stat | |||
hg branch | |||
hg rm mobile | |||
hg commit | |||
hg push -f -e 'ssh -i ~/.ssh/ffxbld_dsa -l ffxbld' ssh://hg.mozilla.org/releases/mozilla-mobile-5.0 | |||
==== l10n changesets ==== | |||
Re-using build1 changesets | |||
==== Start ==== | |||
==== Tag==== | |||
==== Source==== | |||
==== Build/Repack==== | |||
=====repack===== | =====repack===== | ||