Closed
Bug 736696
Opened 12 years ago
Closed 12 years ago
"87984 (3812d0ce274e) Merge last green changeset from inbound to mozilla-central" went wrong
Categories
(Core :: Graphics: CanvasWebGL, defect, P2)
Core
Graphics: CanvasWebGL
Tracking
()
VERIFIED
FIXED
mozilla14
Tracking | Status | |
---|---|---|
firefox14 | --- | fixed |
People
(Reporter: sgautherie, Assigned: mbrubeck)
References
()
Details
(Keywords: regression)
Attachments
(1 file)
3.23 KB,
patch
|
sgautherie
:
feedback+
|
Details | Diff | Splinter Review |
I noticed http://hg.mozilla.org/mozilla-central/diff/3812d0ce274e/content/canvas/test/webgl/test_webgl_conformance_test_suite.html should not have happened at all: m-c code was newer! Please back this (whole) merge out asap. NB: And probably need to do an history check on all these merges...
Flags: in-testsuite-
Assignee | ||
Comment 1•12 years ago
|
||
Sorry! I'm guessing maybe the merge got confused because these changes landed on central: https://hg.mozilla.org/mozilla-central/pushloghtml?changeset=023130d28f50 https://hg.mozilla.org/mozilla-central/pushloghtml?changeset=cb01e23f83cf while one of the same changes landed and was backed out on inbound: https://hg.mozilla.org/integration/mozilla-inbound/pushloghtml?changeset=6a94d3142674 https://hg.mozilla.org/integration/mozilla-inbound/pushloghtml?changeset=f6d04ce89a9e Here's a patch to back out the changes made to this test_webgl_conformance_test_suite.html in the merge. (This was the only file that had conflicts in this merge.) Note: If everyone making changes to a single file can coordinate and land those changes in a single tree, it will completely avoid any conflicts or merges problems like this.
Attachment #607612 -
Flags: review?(sgautherie.bz)
Reporter | ||
Comment 2•12 years ago
|
||
Comment on attachment 607612 [details] [diff] [review] patch (In reply to Matt Brubeck (:mbrubeck) from comment #1) > Here's a patch to back out the changes made to this > test_webgl_conformance_test_suite.html in the merge. (This was the only > file that had conflicts in this merge.) Thanks! Note you now need to back out http://hg.mozilla.org/mozilla-central/diff/c56fbf96661b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html which happened in the meantime, first. > Note: If everyone making changes to a single file can coordinate and land > those changes in a single tree, it will completely avoid any conflicts or > merges problems like this. I don't think that's realistic. Yet, in this occurrence, note that I never asked for that inbound landing.
Attachment #607612 -
Flags: review?(sgautherie.bz) → feedback+
Assignee | ||
Comment 3•12 years ago
|
||
https://hg.mozilla.org/integration/mozilla-inbound/rev/22065301995a
tracking-firefox14:
? → ---
Comment 4•12 years ago
|
||
https://hg.mozilla.org/mozilla-central/rev/22065301995a
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Reporter | ||
Comment 5•12 years ago
|
||
V.Fixed, per MXR.
Severity: blocker → major
Status: RESOLVED → VERIFIED
Component: General → Canvas: WebGL
Priority: P1 → P2
QA Contact: general → canvas.webgl
You need to log in
before you can comment on or make changes to this bug.
Description
•