Closed Bug 816871 Opened 12 years ago Closed 12 years ago

Webapps.jsm is out of sync between mozilla-central and mozilla-beta

Categories

(Core Graveyard :: DOM: Apps, defect, P1)

Product:
Core Graveyard
Component:
DOM: Apps
Type:
defect

Tracking

(blocking-basecamp:+, firefox18 fixed, firefox19 unaffected)

Status:
RESOLVED FIXED
Milestone:
mozilla18
Project Flags:
blocking-basecamp +
Tracking Flags:
Tracking Status
firefox18 --- fixed
firefox19 --- unaffected

People

(Reporter: briansmith, Assigned: RyanVM)

References

Details

(Whiteboard: [qa-])

Attachments

(1 file, 2 obsolete files)

Current diff of Webapps.jsm between m-b and m-c
(deleted), text/plain
Details
+++ This bug was initially created as a clone of Bug #809948 +++ It seems like the change from bug 809948 reverted part of the change for bug 809998, but only on mozilla-beta, not mozilla-central. At least, the relevant sections of Webapps.jsm do not match anymore and I don't understand why. This makes backporting the patch for bug 772365 more complicated.
It seems that Bug 813468, Bug 809998 and Bug 744867 landed in mozilla-central but not in mozilla-beta. Bug 813468 will probably be backed out once we get a final decision in Bug 815523. The other two patches (which are already in Aurora - Bug 809998 and Bug 744867) should land in mozilla-beta.
Attached patch wip (obsolete) (deleted) — — Splinter Review
Ryan, do you think that this patch would fix the issue?
Attachment #687083 - Flags: feedback?(ryanvm)
Attached patch wip (obsolete) (deleted) — — Splinter Review
Attachment #687083 - Attachment is obsolete: true
Attachment #687083 - Flags: feedback?(ryanvm)
Attachment #687084 - Flags: feedback?(ryanvm)
I was going to look into this tonight. I'm not entirely sure at this point how those two bugs didn't end up in beta and want to investigate that first. If your analysis is correct, though, it makes more sense to me that we would just uplift them proper and see where that gets us.
(In reply to Fernando Jiménez Moreno [:ferjm] from comment #1) > The other two patches (which are already in Aurora - Bug 809998 and Bug > 744867) should land in mozilla-beta. As I mentioned in comment 0, I think that 809998 did land in mozilla-beta but the later landing of bug 809948 reverted all or part of it. Not sure about bug 744867.
hg graft 2d34880dfdef && hg graft 4fddb9923ef0 due get mozilla-beta back in sync with mozilla-central, modulo bug 813468.
Priority: -- → P1
I'm really confused because as best I can tell, both of these landed on Aurora prior to its uplift to beta. https://hg.mozilla.org/releases/mozilla-beta/rev/1b764a417fdc https://hg.mozilla.org/releases/mozilla-beta/rev/13365a46ce7d
(In reply to Ryan VanderMeulen from comment #7) > I'm really confused because as best I can tell, both of these landed on > Aurora prior to its uplift to beta. > https://hg.mozilla.org/releases/mozilla-beta/rev/1b764a417fdc > https://hg.mozilla.org/releases/mozilla-beta/rev/13365a46ce7d Please read comment 0 and comment 5 again carefully. Those changes did land in mozilla-beta and then this changeset (inadvertently) reverted those changes: https://hg.mozilla.org/releases/mozilla-beta/rev/7332ccca94de
2d34880dfdef applies with a little fuzz. 4fddb9923ef0 doesn't apply at all. Re-landed 2d34880dfdef on beta. Brian, does this get you what you need? https://hg.mozilla.org/releases/mozilla-beta/rev/39f686efe388
Assignee: fabrice → ryanvm
After tonight's uplifts, here's where we stand. The first two hunks are bug 813468, of course. The final hunk is from bug 744867. I'm not sure how things got messed up, but at least it's an easy fix.
Attachment #687084 - Attachment is obsolete: true
Attachment #687084 - Flags: feedback?(ryanvm)
https://hg.mozilla.org/releases/mozilla-beta/rev/68cb786721c7 Sorry for the hassle and confusion, everyone.
Status: NEW → RESOLVED
Closed: 12 years ago
status-firefox18: --- → fixed
status-firefox19: --- → unaffected
Resolution: --- → FIXED
Target Milestone: --- → mozilla18
Product: Core → Core Graveyard
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: