Bob, can you see if you can find a fix for this sometime today? I'd love for this to make the merge, but this failure is happening too consistently for my comfort. If we don't have a fix soon, I think I'm going to have to back it out.
Severity: normal → critical
Ah, never mind. It looks like this was fixed by https://hg.mozilla.org/integration/mozilla-inbound/rev/c9435de8c24c
Status: NEW → RESOLVED
Last Resolved: 2 years ago
Resolution: --- → FIXED
I'm not sure I follow. If it was fixed via a backout does that mean it's still backed out, or did the push you did after resolving the conflicts re-land it?
The problem was caused by a merge botch. It was fixed by the back-out. The version I re-landed doesn't have this issue.
Great, thanks again Kris.
You need to log in before you can comment on or make changes to this bug.