Firefox:Branch Landing: Difference between revisions
Jump to navigation
Jump to search
(take the tree widget refactoring into account) |
m (formatting) |
||
| 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... | Branch landing will be done by copying files in browser and toolkit down from the branch and smart-merging changes elsewhere... | ||
Points to watch carefully and not just clobber: | == Points to watch carefully and not just clobber: == | ||
* toolkit/components/startup | * toolkit/components/startup | ||
* toolkit/components/Makefile.in | * toolkit/components/Makefile.in | ||
| Line 10: | Line 11: | ||
toolkit/locales has been landed. | toolkit/locales has been landed. | ||
Trunk changes to be reapplied quickly since they might cause breakage: | == Trunk changes to be reapplied quickly 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]. | * 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]. | ||
Revision as of 09:23, 26 November 2004
The plan
Branch landing will be done by copying files in browser and toolkit down from the branch and smart-merging changes elsewhere...
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
- bsmedberg has kept mozilla/chrome up to date on the trunk, no merge is necessary
toolkit/locales has been landed.
Trunk changes to be reapplied quickly 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.