736696 - "87984 (3812d0ce274e) Merge last green changeset from inbound to mozilla-central" went wrong

Status: VERIFIED FIXED

(Core :: Graphics: CanvasWebGL, defect, P2)

Description

[Serge Gautherie (:sgautherie)]

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...

Comment 1

[Matt Brubeck (:mbrubeck)]

Attachment: patch

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.

Comment 2

[Serge Gautherie (:sgautherie)]

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.

Comment 3

[Matt Brubeck (:mbrubeck)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/22065301995a

Comment 4

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/22065301995a

Comment 5

[Serge Gautherie (:sgautherie)]

V.Fixed, per MXR.