Closed
Bug 535560
Opened 15 years ago
Closed 15 years ago
Get Thunderbird 3.0 boxes onto building with gecko 1.9.1.7 and our core sqlite changes
Categories
(Mozilla Messaging Graveyard :: Release Engineering, defect, P1)
Mozilla Messaging Graveyard
Release Engineering
Tracking
(blocking-thunderbird3.0 .1+, thunderbird3.0 .1-fixed)
VERIFIED
FIXED
People
(Reporter: standard8, Assigned: gozer)
Details
Attachments
(1 file)
There's a chance for that we'll be picking up gecko 1.9.1.7 however, there will likely be just a couple of fixes, and I want to get our tinderboxes & nightlies up to date asap. Therefore please can we: - Cut a new release branch based on gecko 1.9.1.6 - Land the mozsqlite changes we landed for 1.9.1.5 onto the new release branch for 1.9.1.6 - Update the buildbot configuration so that TB 3.0 nightlys, bloat and unit tests are running off the new relbranch (note I realised today that the unit test builders have been running off latest mozilla-1.9.1 not our relbranch). If we can do this today, it'll increase our chances of doing a build before Christmas, or if not, just getting a bit of extra testing with the new gecko.
|
Reporter | |
Comment 1•15 years ago
|
||
Just to be clear: - Base revision of the new relbranch is to be FIREFOX_3_5_6_RELEASE (which is on the GECKO1916_20091130_RELBRANCH). - Suggested name for the new relbranch is COMM1916_20091130_RELBRANCH
|
Assignee | |
Comment 2•15 years ago
|
||
The existing patches fail to transplant proprely, looks like sqlite was upgraded to 3.6.16.1 in between. Andrew, any chance you can produce a new all-inclusive patch easily ? $> hg up -C FIREFOX_3_5_6_RELEASE $> hg transplant ebb9e52cff37 8fea1fcb727a 6dc036c1033 applying ebb9e52cff37 patching file db/sqlite3/README.MOZILLA Hunk #1 FAILED at 0 1 out of 1 hunks FAILED -- saving rejects to file db/sqlite3/README.MOZILLA.rej patching file db/sqlite3/src/sqlite3.c Hunk #1 FAILED at 0 Hunk #2 FAILED at 9 Hunk #10 FAILED at 618 Hunk #97 FAILED at 9194 Hunk #753 FAILED at 61732 Hunk #1074 FAILED at 93575 6 out of 1109 hunks FAILED -- saving rejects to file db/sqlite3/src/sqlite3.c.rej patching file db/sqlite3/src/sqlite3.h Hunk #4 FAILED at 86 1 out of 131 hunks FAILED -- saving rejects to file db/sqlite3/src/sqlite3.h.rej file storage/public/mozIStorageBindingParams.idl already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/public/mozIStorageBindingParams.idl.rej file storage/public/mozIStorageBindingParamsArray.idl already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/public/mozIStorageBindingParamsArray.idl.rej file storage/public/mozIStorageCompletionCallback.idl already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/public/mozIStorageCompletionCallback.idl.rej file storage/public/storage.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/public/storage.h.rej file storage/src/SQLCollations.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/SQLCollations.cpp.rej file storage/src/SQLCollations.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/SQLCollations.h.rej file storage/src/SQLiteMutex.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/SQLiteMutex.h.rej file storage/src/Variant.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/Variant.h.rej file storage/src/Variant_inl.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/Variant_inl.h.rej file storage/src/mozStorageArgValueArray.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageArgValueArray.cpp.rej file storage/src/mozStorageArgValueArray.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageArgValueArray.h.rej file storage/src/mozStorageAsyncStatementExecution.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageAsyncStatementExecution.cpp.rej file storage/src/mozStorageAsyncStatementExecution.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageAsyncStatementExecution.h.rej file storage/src/mozStorageBindingParams.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageBindingParams.cpp.rej file storage/src/mozStorageBindingParams.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageBindingParams.h.rej file storage/src/mozStorageBindingParamsArray.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageBindingParamsArray.cpp.rej file storage/src/mozStorageBindingParamsArray.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageBindingParamsArray.h.rej file storage/src/mozStoragePrivateHelpers.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStoragePrivateHelpers.cpp.rej patching file storage/src/mozStorageResultSet.cpp Hunk #2 FAILED at 39 1 out of 3 hunks FAILED -- saving rejects to file storage/src/mozStorageResultSet.cpp.rej file storage/src/mozStorageSQLFunctions.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageSQLFunctions.cpp.rej file storage/src/mozStorageSQLFunctions.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageSQLFunctions.h.rej file storage/src/mozStorageStatementData.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/mozStorageStatementData.h.rej file storage/src/variantToSQLiteT_impl.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/src/variantToSQLiteT_impl.h.rej file storage/style.txt already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/style.txt.rej file storage/test/storage_test_harness.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/storage_test_harness.h.rej file storage/test/storage_test_harness_tail.h already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/storage_test_harness_tail.h.rej file storage/test/test_deadlock_detector.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/test_deadlock_detector.cpp.rej file storage/test/test_mutex.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/test_mutex.cpp.rej file storage/test/test_statement_scoper.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/test_statement_scoper.cpp.rej file storage/test/test_transaction_helper.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/test_transaction_helper.cpp.rej file storage/test/unit/locale_collation.txt already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/locale_collation.txt.rej file storage/test/unit/test_async_is_really_async.js already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/test_async_is_really_async.js.rej file storage/test/unit/test_js_helpers_enumerate.js already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/test_js_helpers_enumerate.js.rej file storage/test/unit/test_js_helpers_prototype_chain_safe.js already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/test_js_helpers_prototype_chain_safe.js.rej file storage/test/unit/test_levenshtein.js already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/test_levenshtein.js.rej file storage/test/unit/test_locale_collation.js already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/test_locale_collation.js.rej file storage/test/unit/test_statement_executeAsync.js already exists 1 out of 1 hunks FAILED -- saving rejects to file storage/test/unit/test_statement_executeAsync.js.rej file xpcom/ds/TimeStamp.h already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/ds/TimeStamp.h.rej file xpcom/glue/BlockingResourceBase.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/BlockingResourceBase.cpp.rej file xpcom/glue/BlockingResourceBase.h already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/BlockingResourceBase.h.rej file xpcom/glue/CondVar.h already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/CondVar.h.rej file xpcom/glue/DeadlockDetector.cpp already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/DeadlockDetector.cpp.rej file xpcom/glue/DeadlockDetector.h already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/DeadlockDetector.h.rej file xpcom/glue/Monitor.h already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/Monitor.h.rej file xpcom/glue/Mutex.h already exists 1 out of 1 hunks FAILED -- saving rejects to file xpcom/glue/Mutex.h.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue
|
||
Comment 3•15 years ago
|
||
Attachment #418269 -
Flags: review?(gozer)
|
|
Assignee | |
Comment 4•15 years ago
|
||
Comment on attachment 418269 [details]
v1 updated patch off of FIREFOX_3_5_6_RELEASE bzip2-ed
Applies like a charm.
115 files changed, 25664 insertions(+), 13268 deletions(-)
Should I just go ahead and land this/create the relbranch ?
Attachment #418269 -
Flags: review?(gozer) → review+
|
|
Reporter | |
Comment 5•15 years ago
|
||
Now that 1.9.1.7 has started being built, we'll base the relbranch off of the 1.9.1.7 builds: Relbranch base: GECKO1916_20091130_RELBRANCH / revision 655f0b1c7f6a http://hg.mozilla.org/releases/mozilla-1.9.1/rev/655f0b1c7f6a (which is currently FIREFOX_3_5_7_RELEASE).
blocking-thunderbird3.0: --- → .1+
Summary: Get Thunderbird 3.0 boxes onto building with gecko 1.9.1.6 and our core sqlite changes → Get Thunderbird 3.0 boxes onto building with gecko 1.9.1.7 and our core sqlite changes
|
|
Assignee | |
Comment 6•15 years ago
|
||
comparing with http://hg.mozilla.org/releases/mozilla-1.9.1 searching for changes changeset: 26700:582837b5df80 branch: COMM1916_20091130_RELBRANCH tag: tip parent: 26690:655f0b1c7f6a user: Philippe M. Chiasson <gozer@mozillamessaging.com> date: Tue Dec 22 15:49:09 2009 -0500 summary: Bug 535560 - Create Thunderbird release-branch COMM1916_20091130_RELBRANCH with gecko 1.9.1.7 and our core sqlite changes. p=asuth,r=gozer,Standard8
|
|
Assignee | |
Comment 7•15 years ago
|
||
comm-1.9.1 builders updated to pull from that branch.
Status: NEW → RESOLVED
Closed: 15 years ago
Resolution: --- → FIXED
|
|
Reporter | |
Comment 8•15 years ago
|
||
I checked in an additional fix to fix the bloat builders (based on asuth's ones from the original branch): http://hg.mozilla.org/releases/mozilla-1.9.1/rev/67094ede1785 For verification, we're going to need to know that we have correctly landed the changes and that bug 529995 is still fixed.
|
|
Reporter | |
Updated•15 years ago
|
status-thunderbird3.0:
--- → .1-fixed
|
||
Comment 9•15 years ago
|
||
(In reply to comment #8) > For verification, we're going to need to know that we have correctly landed the > changes and that bug 529995 is still fixed. No crashes in the last week. V. Fixed based on that and the fact that I can search my emails.
Status: RESOLVED → VERIFIED
Keywords: verified-thunderbird3.0
You need to log in
before you can comment on or make changes to this bug.
Description
•