Closed
Bug 716478
Opened 13 years ago
Closed 12 years ago
MPL 2 upgrade: mozilla-central
Categories
(mozilla.org :: Licensing, task)
mozilla.org
Licensing
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: gerv, Assigned: gerv)
References
Details
This bug tracks the MPL 2 upgrade for the project named in the subject line. The repos are here: http://hg.mozilla.org/mozilla-central/ http://hg.mozilla.org/comm-central/ Gerv
Comment 1•12 years ago
|
||
(Popping this here so my comments don't get lost in scrollback) Gerv, the latest m-c try run looks much better, just the B2G and Android failures left (the rest I've starred since it's all known intermittents): https://tbpl.mozilla.org/?tree=Try&rev=8af7f8d3ef05 I'd guess the android issue looks like a problem with https://hg.mozilla.org/try/diff/8af7f8d3ef05/mobile/android/base/strings.xml.in For the B2G failure there's an error further back in the log that looks like the root cause: "ERROR - failed to load manifest file at 'b2g/config/tooltool-manifests/releng.manifest'" So I'm presuming it doesn't like https://hg.mozilla.org/try/diff/8af7f8d3ef05/b2g/config/tooltool-manifests/releng.manifest
Comment 2•12 years ago
|
||
For people coming here from the tree closed status message: The latest MPL2 update script has been run against m-c tip by gerv and pushed to try. Once that greens up, we'll push to m-c, merge to inbound and fx-team, wait for a bit of green and then re-open :-)
Comment 3•12 years ago
|
||
First try run today: https://tbpl.mozilla.org/?tree=Try&rev=8c50ab7ec8d6 The orange M2 was due to bug 751842 landing a few hours after the last all-green MPL2 try run. Gerv excluded dom/imptests/* and pushed again, looking good so far: https://tbpl.mozilla.org/?tree=Try&rev=0bd230403cec
Comment 4•12 years ago
|
||
Main landing: https://hg.mozilla.org/mozilla-central/rev/f4157e8c4107 Test fixups: https://hg.mozilla.org/mozilla-central/rev/b81020e8ca5c https://hg.mozilla.org/mozilla-central/rev/6199ba8e3cd0
Assignee | ||
Comment 5•12 years ago
|
||
We are doing comm-central separately; see bug 757018. This bug should be used to track m-c only. Gerv
Summary: MPL 2 upgrade: mozilla-central and comm-central → MPL 2 upgrade: mozilla-central
Comment 6•12 years ago
|
||
All done here :-) mozilla-central has been merged to inbound and fx-team, all is green & trees were reopened at ~1300 UTC+1. Any files added over the coming days/weeks that have the old header can be dealt with as dependants of bug 715549. From Gerv's blog post: > 15541 files changed, 48359 insertions(+), 494914 deletions(-) \o/
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Comment 7•11 years ago
|
||
The license header in nsXULContentUtils.cpp included attribution to IBM in an idiosyncratic format. It's still there. http://mxr.mozilla.org/mozilla-central/source/content/xul/templates/src/nsXULContentUtils.cpp http://hg.mozilla.org/mozilla-central/diff/f4157e8c4107/content/xul/templates/src/nsXULContentUtils.cpp
Pushed by frgrahl@gmx.net: https://hg.mozilla.org/comm-central/rev/1130eb7b4a2a update licence to MPL 2.
You need to log in
before you can comment on or make changes to this bug.
Description
•