Last Comment Bug 717402 - Permanent orange: TEST-UNEXPECTED-FAIL | test-about-support.js | test-about-support.js::*
: Permanent orange: TEST-UNEXPECTED-FAIL | test-about-support.js | test-about-s...
Status: RESOLVED FIXED
[fixed by bug 631909]
:
Product: Thunderbird
Classification: Client Software
Component: Testing Infrastructure (show other bugs)
: 12 Branch
: All All
: -- normal (vote)
: Thunderbird 12.0
Assigned To: :aceman
:
:
Mentors:
Depends on:
Blocks: 631909
  Show dependency treegraph
 
Reported: 2012-01-11 13:57 PST by Mike Conley (:mconley)
Modified: 2012-01-12 06:10 PST (History)
2 users (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---


Attachments
Patch v1 (732 bytes, patch)
2012-01-11 14:01 PST, Mike Conley (:mconley)
no flags Details | Diff | Splinter Review

Description Mike Conley (:mconley) 2012-01-11 13:57:58 PST
The patch for bug 631909 changed the string key "aboutSupport.modifiedPrefsTitle" on us, and broke our about:support.
Comment 1 Mike Conley (:mconley) 2012-01-11 14:01:02 PST
Created attachment 587811 [details] [diff] [review]
Patch v1

Tests are now passing locally.
Comment 2 Mike Conley (:mconley) 2012-01-11 14:02:05 PST
Comment on attachment 587811 [details] [diff] [review]
Patch v1

This fixes it.
Comment 3 :aceman 2012-01-11 14:03:44 PST
No wonder. I specified in bug 631909 that both patches (for FF and TB) must be merged simultaneously. Dao only took the FF patch.
Can you merge the other one? This bug should vanish.
Comment 4 :aceman 2012-01-11 14:04:07 PST
I even have review there, no need to bother mbanner.
Comment 5 Mike Conley (:mconley) 2012-01-11 14:10:56 PST
Ah, k - I'll check in the patch in bug 631909.
Comment 6 Mike Conley (:mconley) 2012-01-11 14:11:27 PST
Comment on attachment 587811 [details] [diff] [review]
Patch v1

There's a patch in bug 631909 that fixes this - it just didn't get checked in to comm-central.
Comment 7 Mike Conley (:mconley) 2012-01-11 14:17:26 PST
The patch in bug 631909 (https://bugzilla.mozilla.org/attachment.cgi?id=583580) was committed to comm-central as http://hg.mozilla.org/comm-central/rev/c01205ffb4f8
Comment 8 :aceman 2012-01-11 14:19:23 PST
Can you tell me how to avoid this next time?
I have several more bugs where there are patches for FF and TB that must be merged at once. But they must be done as two files due to 'hg mq' and possibly checkin rights of various people.
Comment 9 Mike Conley (:mconley) 2012-01-12 06:10:14 PST
aceman:

For things like this, I think it's enough to make sure that there's a TB developer CC'd on the bug.  Pinging us in IRC also helps. :)

-Mike

Note You need to log in before you can comment on or make changes to this bug.