Mercurial > emacs
view admin/notes/bzr @ 109147:783986775ee8
Set default-frame-alist, if necessary, in menu/tool-bar-mode.
* menu-bar.el (menu-bar-mode):
* tool-bar.el (tool-bar-mode): Replace default-frame-alist element
if it has been set.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 05 Jul 2010 13:54:13 -0400 |
parents | c8d754c15c55 |
children | d074b0e8afef |
line wrap: on
line source
NOTES ON COMMITTING TO EMACS'S BAZAAR REPO -*- outline -*- * Install changes only on one branch, let them get merged elsewhere if needed. In particular, install bug-fixes only on the release branch (if there is one) and let them get synced to the trunk; do not install them by hand on the trunk as well. E.g. if there is an active "emacs-23" branch and you have a bug-fix appropriate for the next Emacs-23.x release, install it only on the emacs-23 branch, not on the trunk as well. Installing things manually into more than one branch makes merges more difficult. http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01124.html * Backporting a bug-fix from the trunk to a branch (e.g. "emacs-23"). Label the commit as a backport, e.g. by starting the commit message with "Backport:". This is helpful for the person merging the release branch to the trunk. http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html * Installing changes from your personal branches. If your branch has only a single commit, or many different real commits, it is fine to do a merge. If your branch has only a very small number of "real" commits, but several "merge from trunks", it is preferred that you take your branch's diff, apply it to the trunk, and commit directly, not merge. This keeps the history cleaner. In general, when working on some feature in a separate branch, it is preferable not to merge from trunk until you are done with the feature. Unless you really need some change that was done on the trunk while you were developing on the branch, you don't really need those merges; just merge once, when you are done with the feature, and Bazaar will take care of the rest. Bazaar is much better in this than CVS, so interim merges are unnecessary. Or use shelves; or rebase; or do something else. See the thread for yet another fun excursion into the exciting world of version control. http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html