Firefox:Branch Landing: Difference between revisions
Jump to navigation
Jump to search
Georgebush (talk | contribs) (Calculus I INTRODUCTION) |
m (Reverted edit of Georgebush, changed back to last version by Grantaw) |
||
| Line 1: | Line 1: | ||
== The plan == | |||
Branch landing will be done by copying files in browser and toolkit down from the branch and smart-merging changes elsewhere...<br> | |||
Introduce reland-irsn in Status Whiteboard to mark bugs/patches that need relanding, because changes were overwritten by merge of browser/ and toolkit/? | |||
== Points to watch carefully and not just clobber == | |||
* toolkit/components/startup | |||
* toolkit/components/Makefile.in | |||
* tree wide changes from [https://bugzilla.mozilla.org/show_bug.cgi?id=app-startup 237745] affect browser (browser/app/splash.rc, toolkit/content/globalOverlay.js, etc) | |||
* nsXULAppAPI has changed, so has xre_main. Probably nsBrowserApp.cpp should use the trunk version, not the branch version | |||
=== Already up to date, no merge necessary === | |||
* mozilla/chrome (bsmedberg) | |||
* toolkit/locales has been landed (bsmedberg) | |||
* mozilla/browser/components/help/locale/en-US, mozilla/toolkit/components/help/locale/en-US, mozilla/toolkit/components/help/helpOnHelp/locale/en-US (Jeff and Steffen) | |||
== Trunk changes to be reapplied quickly to browser and toolkit since they might cause breakage == | |||
* tree widget refactoring and enhancement from [https://bugzilla.mozilla.org/show_bug.cgi?id=221619 bug 221619] (checked in after the 1.7-branch was cut, so it missed aviary, which was cut from 1.7).<br>[http://bonsai.mozilla.org/cvsquery.cgi?branch=&dir=mozilla%2Fbrowser%2C+mozilla%2Ftoolkit&date=explicit&mindate=2004-04-16+22%3A53&maxdate=2004-04-16+22%3A53 Bonsai query limited to browser and toolkit]. [http://bonsai.mozilla.org/cvsquery.cgi?branch=&who=varga%25nixcorp.com&whotype=match&sortby=Date&hours=2&date=explicit&mindate=2004-04-16+22%3A53&maxdate=2004-04-18+11%3A52&cvsroot=%2Fcvsroot The full glory]. | |||
* A number of #ifdef MOZ_SUNBIRD checks in toolkit makefiles to be able to build sunbird | |||
== Trunk landing needed outside browser and toolkit == | |||
* new Tabbed Browsing options: [https://bugzilla.mozilla.org/show_bug.cgi?id=172962 bug 172962], [https://bugzilla.mozilla.org/show_bug.cgi?id=263956 bug 263956] (danm?) | |||
* new Plugin Finder Service: [https://bugzilla.mozilla.org/show_bug.cgi?id=244125 bug 244125] (jst/doronr?) | |||
== Branch stability fixes to be reverted on trunk == | |||
* Turn on Stylesheet switcher icon (kinda [https://bugzilla.mozilla.org/show_bug.cgi?id=257859 bug 257859]) | |||
* Readd bookmark update notification/scheduling ([https://bugzilla.mozilla.org/show_bug.cgi?id=253478 bug 253478]) | |||
* <s>Restart-less theme switching</s> (seems to have been left as-is, with dynamic switching enabled now) | |||
* <s>Single Window Mode</s> (enabled by Ben during aviary landing) | |||
* others? | |||
Revision as of 03:25, 19 August 2005
The plan
Branch landing will be done by copying files in browser and toolkit down from the branch and smart-merging changes elsewhere...
Introduce reland-irsn in Status Whiteboard to mark bugs/patches that need relanding, because changes were overwritten by merge of browser/ and toolkit/?
Points to watch carefully and not just clobber
- toolkit/components/startup
- toolkit/components/Makefile.in
- tree wide changes from 237745 affect browser (browser/app/splash.rc, toolkit/content/globalOverlay.js, etc)
- nsXULAppAPI has changed, so has xre_main. Probably nsBrowserApp.cpp should use the trunk version, not the branch version
Already up to date, no merge necessary
- mozilla/chrome (bsmedberg)
- toolkit/locales has been landed (bsmedberg)
- mozilla/browser/components/help/locale/en-US, mozilla/toolkit/components/help/locale/en-US, mozilla/toolkit/components/help/helpOnHelp/locale/en-US (Jeff and Steffen)
Trunk changes to be reapplied quickly to browser and toolkit since they might cause breakage
- tree widget refactoring and enhancement from bug 221619 (checked in after the 1.7-branch was cut, so it missed aviary, which was cut from 1.7).
Bonsai query limited to browser and toolkit. The full glory. - A number of #ifdef MOZ_SUNBIRD checks in toolkit makefiles to be able to build sunbird
Trunk landing needed outside browser and toolkit
- new Tabbed Browsing options: bug 172962, bug 263956 (danm?)
- new Plugin Finder Service: bug 244125 (jst/doronr?)
Branch stability fixes to be reverted on trunk
- Turn on Stylesheet switcher icon (kinda bug 257859)
- Readd bookmark update notification/scheduling (bug 253478)
Restart-less theme switching(seems to have been left as-is, with dynamic switching enabled now)Single Window Mode(enabled by Ben during aviary landing)- others?